Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / fs / fat / file.c

diff --git a/fs/fat/file.c b/fs/fat/file.c
index 0aa813d944a67fec2e7955eadeb3e781b66915c9..55d3c7461c5b9acb50b851fae64df4a68dcd3d01 100644 (file)
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -92,7 +92,7 @@ int fat_generic_ioctl(struct inode *inode, struct file *filp,
                }
 
                /* This MUST be done before doing anything irreversible... */
-               err = notify_change(filp->f_dentry, &ia);
+               err = notify_change(filp->f_path.dentry, &ia);
                if (err)
                        goto up;
 
@@ -312,7 +312,7 @@ int fat_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
 }
 EXPORT_SYMBOL_GPL(fat_getattr);
 
-struct inode_operations fat_file_inode_operations = {
+const struct inode_operations fat_file_inode_operations = {
        .truncate       = fat_truncate,
        .setattr        = fat_notify_change,
        .getattr        = fat_getattr,