Merge tag 'dlm-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[firefly-linux-kernel-4.4.55.git] / fs / befs / inode.c

diff --git a/fs/befs/inode.c b/fs/befs/inode.c
index d41c9247ae8af62764f7fa05226a68437bff7508..fa4b718de597394cf4b50be1fb877937d8f5935d 100644 (file)
--- a/fs/befs/inode.c
+++ b/fs/befs/inode.c
@@ -8,7 +8,6 @@
 
 #include "befs.h"
 #include "inode.h"
-#include "endian.h"
 
 /*
        Validates the correctness of the befs inode
@@ -26,7 +25,8 @@ befs_check_inode(struct super_block *sb, befs_inode * raw_inode,
        /* check magic header. */
        if (magic1 != BEFS_INODE_MAGIC1) {
                befs_error(sb,
-                          "Inode has a bad magic header - inode = %lu", inode);
+                          "Inode has a bad magic header - inode = %lu",
+                          (unsigned long)inode);
                return BEFS_BAD_INODE;
        }
 
@@ -35,8 +35,8 @@ befs_check_inode(struct super_block *sb, befs_inode * raw_inode,
         */
        if (inode != iaddr2blockno(sb, &ino_num)) {
                befs_error(sb, "inode blocknr field disagrees with vfs "
-                          "VFS: %lu, Inode %lu",
-                          inode, iaddr2blockno(sb, &ino_num));
+                          "VFS: %lu, Inode %lu", (unsigned long)
+                          inode, (unsigned long)iaddr2blockno(sb, &ino_num));
                return BEFS_BAD_INODE;
        }
 
@@ -45,7 +45,8 @@ befs_check_inode(struct super_block *sb, befs_inode * raw_inode,
         */
 
        if (!(flags & BEFS_INODE_IN_USE)) {
-               befs_error(sb, "inode is not used - inode = %lu", inode);
+               befs_error(sb, "inode is not used - inode = %lu",
+                          (unsigned long)inode);
                return BEFS_BAD_INODE;
        }