Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z

[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / cramfs / inode.c

diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 739fb59..a2ee8f9 100644 (file)
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -20,7 +20,6 @@
 #include <linux/cramfs_fs.h>
 #include <linux/slab.h>
 #include <linux/cramfs_fs_sb.h>
-#include <linux/buffer_head.h>
 #include <linux/vfs.h>
 #include <linux/mutex.h>
 
@@ -378,7 +377,7 @@ static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                unsigned long nextoffset;
                char *name;
                ino_t ino;
-               mode_t mode;
+               umode_t mode;
                int namelen, error;
 
                mutex_lock(&read_mutex);