Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / drivers / staging / lustre / lustre / llite / rw26.c

diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index 6b5994577b6b9f61bbb704341c72f0fa088183b7..af84c1aaa5f83f6c994a64da4b164535cbe54ac0 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -380,8 +380,8 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
        if ((file_offset & ~CFS_PAGE_MASK) || (count & ~CFS_PAGE_MASK))
                return -EINVAL;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), size=%lu (max %lu), "
-              "offset=%lld=%llx, pages %lu (max %lu)\n",
+       CDEBUG(D_VFSTRACE,
+              "VFS Op:inode=%lu/%u(%p), size=%zd (max %lu), offset=%lld=%llx, pages %zd (max %lu)\n",
               inode->i_ino, inode->i_generation, inode, count, MAX_DIO_SIZE,
               file_offset, file_offset, count >> PAGE_CACHE_SHIFT,
               MAX_DIO_SIZE >> PAGE_CACHE_SHIFT);
@@ -507,9 +507,9 @@ static int ll_write_end(struct file *file, struct address_space *mapping,
 }
 
 #ifdef CONFIG_MIGRATION
-int ll_migratepage(struct address_space *mapping,
-               struct page *newpage, struct page *page
-               , enum migrate_mode mode
+static int ll_migratepage(struct address_space *mapping,
+                        struct page *newpage, struct page *page,
+                        enum migrate_mode mode
                )
 {
        /* Always fail page migration until we have a proper implementation */
@@ -518,9 +518,8 @@ int ll_migratepage(struct address_space *mapping,
 #endif
 
 #ifndef MS_HAS_NEW_AOPS
-struct address_space_operations ll_aops = {
-       .readpage       = ll_readpage,
-//     .readpages      = ll_readpages,
+const struct address_space_operations ll_aops = {
+       .readpage       = ll_readpage,
        .direct_IO      = ll_direct_IO_26,
        .writepage      = ll_writepage,
        .writepages     = ll_writepages,
@@ -532,10 +531,9 @@ struct address_space_operations ll_aops = {
 #ifdef CONFIG_MIGRATION
        .migratepage    = ll_migratepage,
 #endif
-       .bmap      = NULL
 };
 #else
-struct address_space_operations_ext ll_aops = {
+const struct address_space_operations_ext ll_aops = {
        .orig_aops.readpage       = ll_readpage,
 //     .orig_aops.readpages      = ll_readpages,
        .orig_aops.direct_IO      = ll_direct_IO_26,
@@ -549,7 +547,6 @@ struct address_space_operations_ext ll_aops = {
 #ifdef CONFIG_MIGRATION
        .orig_aops.migratepage    = ll_migratepage,
 #endif
-       .orig_aops.bmap    = NULL,
        .write_begin    = ll_write_begin,
        .write_end      = ll_write_end
 };