Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / fs / configfs / dir.c

diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 712b10f64c709ff8a27d423aa7a5186f80aec04f..7aabc6ad4e9bbda4cec09f30545f7d828b0c431a 100644 (file)
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -1037,10 +1037,11 @@ static int configfs_dump(struct configfs_dirent *sd, int level)
 static int configfs_depend_prep(struct dentry *origin,
                                struct config_item *target)
 {
-       struct configfs_dirent *child_sd, *sd = origin->d_fsdata;
+       struct configfs_dirent *child_sd, *sd;
        int ret = 0;
 
-       BUG_ON(!origin || !sd);
+       BUG_ON(!origin || !origin->d_fsdata);
+       sd = origin->d_fsdata;
 
        if (sd->s_element == target)  /* Boo-yah */
                goto out;
@@ -1625,7 +1626,7 @@ static loff_t configfs_dir_lseek(struct file *file, loff_t offset, int whence)
                        if (offset >= 0)
                                break;
                default:
-                       mutex_unlock(&file->f_path.dentry->d_inode->i_mutex);
+                       mutex_unlock(&file_inode(file)->i_mutex);
                        return -EINVAL;
        }
        if (offset != file->f_pos) {