Branch b1_6

Quiet compile warning when CONFIG_LSF is on (large single file).

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index d4a4e48..0b45483 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -1035,8 +1035,8 @@ int ll_glimpse_size(struct inode *inode, int ast_flags)
         LTIME_S(inode->i_ctime) = lvb.lvb_ctime;
         ll_inode_size_unlock(inode, 1);
 
-        CDEBUG(D_DLMTRACE, "glimpse: size: %llu, blocks: %lu\n",
-               inode->i_size, inode->i_blocks);
+        CDEBUG(D_DLMTRACE, "glimpse: size: %llu, blocks: %llu\n",
+               inode->i_size, (long long)inode->i_blocks);
 
         RETURN(rc);
 }

diff --git a/lustre/quota/quotacheck_test.c b/lustre/quota/quotacheck_test.c
index c22afe2..c5ec4aa 100644 (file)
--- a/lustre/quota/quotacheck_test.c
+++ b/lustre/quota/quotacheck_test.c
@@ -85,8 +85,9 @@ static void print_inode(struct inode *inode)
             S_ISLNK(inode->i_mode))
                 size = inode_get_bytes(inode);
 
-         CERROR("%lu: uid: %u, size: %llu, blocks: %lu, real size: %llu\n",
-               inode->i_ino, inode->i_uid, inode->i_size, inode->i_blocks, size);
+         CERROR("%lu: uid: %u, size: %llu, blocks: %llu, real size: %llu\n",
+               inode->i_ino, inode->i_uid, inode->i_size,
+               (long long)inode->i_blocks, size);
 }
 
 /* Test quotaon */