Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / fs / efs / dir.c

diff --git a/fs/efs/dir.c b/fs/efs/dir.c
index 17f5b2d3c16a7071a18010926d574a26046569b1..dfb5cb400217c983dba9a6503ca1f098db07758e 100644 (file)
--- a/fs/efs/dir.c
+++ b/fs/efs/dir.c
@@ -15,12 +15,12 @@ const struct file_operations efs_dir_operations = {
        .readdir        = efs_readdir,
 };
 
-struct inode_operations efs_dir_inode_operations = {
+const struct inode_operations efs_dir_inode_operations = {
        .lookup         = efs_lookup,
 };
 
 static int efs_readdir(struct file *filp, void *dirent, filldir_t filldir) {
-       struct inode *inode = filp->f_dentry->d_inode;
+       struct inode *inode = filp->f_path.dentry->d_inode;
        struct buffer_head *bh;
 
        struct efs_dir          *dirblock;