[XFS] Make couple names consitent, be more defensive on releasepage (and

prep for nobh, someday, maybe).

SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:25481a

Signed-off-by: Nathan Scott <nathans@sgi.com>

diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 448912f0e75341599dacc022c33c06a5087a7427..d9bf130c63ba7e9bffe37c3c2a9904d04616c79a 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -1178,7 +1178,7 @@ out_unlock:
  *    free them and we should come back later via writepage.
  */
 STATIC int
-xfs_vm_release_page(
+xfs_vm_releasepage(
        struct page             *page,
        gfp_t                   gfp_mask)
 {
@@ -1191,6 +1191,9 @@ xfs_vm_release_page(
 
        xfs_page_trace(XFS_RELEASEPAGE_ENTER, inode, page, gfp_mask);
 
+       if (!page_has_buffers(page))
+               return 0;
+
        xfs_count_page_state(page, &delalloc, &unmapped, &unwritten);
        if (!delalloc && !unwritten)
                goto free_buffers;
@@ -1440,7 +1443,7 @@ xfs_vm_readpages(
 }
 
 STATIC int
-xfs_vm_invalidate_page(
+xfs_vm_invalidatepage(
        struct page             *page,
        unsigned long           offset)
 {
@@ -1454,8 +1457,8 @@ struct address_space_operations xfs_address_space_operations = {
        .readpages              = xfs_vm_readpages,
        .writepage              = xfs_vm_writepage,
        .sync_page              = block_sync_page,
-       .releasepage            = xfs_vm_release_page,
-       .invalidatepage         = xfs_vm_invalidate_page,
+       .releasepage            = xfs_vm_releasepage,
+       .invalidatepage         = xfs_vm_invalidatepage,
        .prepare_write          = xfs_vm_prepare_write,
        .commit_write           = generic_commit_write,
        .bmap                   = xfs_vm_bmap,