---

yaml --- r: 318847 b: refs/heads/master c: e54bfa3 h: refs/heads/master i: 318845: d2399d7 318843: bc97c74 318839: 7467d00 318831: 1e8ba6f 318815: d353d74 318783: 62fc4b9 318719: e36cabd v: v3
git-mirror · Jul 23, 2012 · 3f1e945 · 3f1e945
1 parent 889675c
commit 3f1e945
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 768e9dfe820abdcfb6683e05c60b8634f1a4ffce
+refs/heads/master: e54bfa31044d602a57d4e190f6d1c3763ea76bfe
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
@@ -3265,7 +3265,7 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
 
-	ret = mnt_want_write(file->f_path.mnt);
+	ret = mnt_want_write_file(file);
 	if (ret)
 		return ret;
 
@@ -3335,7 +3335,7 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
 out:
 	mutex_unlock(&fs_info->balance_mutex);
 	mutex_unlock(&fs_info->volume_mutex);
-	mnt_drop_write(file->f_path.mnt);
+	mnt_drop_write_file(file);
 	return ret;
 }