FROMLIST: drm/bridge: analogix_dp: Don't read EDID if panel present

[firefly-linux-kernel-4.4.55.git] / fs / sdcardfs / file.c

diff --git a/fs/sdcardfs/file.c b/fs/sdcardfs/file.c
index c249fa982d3c72706bfb708f56dd3d91409e35af..23f8cd7f8877dfd679fd83ce7f6ad1e26ff24fa0 100644 (file)
--- a/fs/sdcardfs/file.c
+++ b/fs/sdcardfs/file.c
@@ -216,7 +216,7 @@ static int sdcardfs_open(struct inode *inode, struct file *file)
                goto out_err;
        }
 
-       if(!check_caller_access_to_name(parent->d_inode, dentry->d_name.name)) {
+       if(!check_caller_access_to_name(d_inode(parent), &dentry->d_name)) {
                printk(KERN_INFO "%s: need to check the caller's gid in packages.list\n"
                          "     dentry: %s, task:%s\n",
                                                 __func__, dentry->d_name.name, current->comm);
@@ -225,7 +225,7 @@ static int sdcardfs_open(struct inode *inode, struct file *file)
        }
 
        /* save current_cred and override it */
-       OVERRIDE_CRED(sbi, saved_cred);
+       OVERRIDE_CRED(sbi, saved_cred, SDCARDFS_I(inode));
 
        file->private_data =
                kzalloc(sizeof(struct sdcardfs_file_info), GFP_KERNEL);