From 3f1e945a183d42f15745834051bb2f5f2e4ae266 Mon Sep 17 00:00:00 2001 From: Liu Bo Date: Fri, 29 Jun 2012 03:58:48 -0600 Subject: [PATCH] --- yaml --- r: 318847 b: refs/heads/master c: e54bfa31044d602a57d4e190f6d1c3763ea76bfe h: refs/heads/master i: 318845: d2399d7082502694ca8cc5a3908aaf4019950888 318843: bc97c7488f518d78e9cafe1084677d78dbd7abce 318839: 7467d0090466d3666518c091c7d9b311a8542e82 318831: 1e8ba6f22a58508b4ae240327d0e873cde994a24 318815: d353d74ce6c1a179b17043cb01bedb415684f709 318783: 62fc4b98c78e99e250d632eb8427fd42ca5c08d6 318719: e36cabd698143e4e1cd447f4309519a38e947e14 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/ioctl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1c4481925d39..0e3591c9c0aa 100644 --- 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 index b8034dc62e38..13ed1c9534cc 100644 --- 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; }