a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-linus-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Browse Source 
Pull btrfs merge fix from Chris Mason:
 "This fixes a merge error in rc1.  The calls to mnt_want_write should
  have been removed."

* 'for-linus-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: remove mnt_want_write call in btrfs_mksubvol
This commit is contained in:
Linus Torvalds 2012-08-12 21:28:41 +03:00
commit 15fc5deb1f
1 changed files with 0 additions and 5 deletions

5
fs/btrfs/ioctl.c
View File

@ -664,10 +664,6 @@ static noinline int btrfs_mksubvol(struct path *parent,
struct dentry *dentry; struct dentry *dentry;
int error; int error;
error = mnt_want_write(parent->mnt);
if (error)
return error;
mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT); mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT);
dentry = lookup_one_len(name, parent->dentry, namelen); dentry = lookup_one_len(name, parent->dentry, namelen);
@ -703,7 +699,6 @@ out_dput:
dput(dentry); dput(dentry);
out_unlock: out_unlock:
mutex_unlock(&dir->i_mutex); mutex_unlock(&dir->i_mutex);
mnt_drop_write(parent->mnt);
return error; return error;
} }