diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 21:28:41 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 21:28:41 +0300 |
| commit | 15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c (patch) | |
| tree | 9e55cc5e2c635b8680c487d20b8ced63b5da0579 | |
| parent | e3756477aec028427fec767957c0d4b6cfb87208 (diff) | |
| parent | e00da2067b78a9246f767012a3803224c40b1f9f (diff) | |
| download | linux-15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c.tar.bz2 | |
Merge branch 'for-linus-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
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
| -rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index bc2f6ffff3cf..7bb755677a22 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -664,10 +664,6 @@ static noinline int btrfs_mksubvol(struct path *parent, struct dentry *dentry; int error; - error = mnt_want_write(parent->mnt); - if (error) - return error; - mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT); dentry = lookup_one_len(name, parent->dentry, namelen); @@ -703,7 +699,6 @@ out_dput: dput(dentry); out_unlock: mutex_unlock(&dir->i_mutex); - mnt_drop_write(parent->mnt); return error; } |