Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15fc5deb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e3756477 e00da206

fs/btrfs/ioctl.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

}