aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorliubo <liubo2009@cn.fujitsu.com>2011-02-24 04:38:16 -0500
committerroot <Chris Mason chris.mason@oracle.com>2011-03-28 05:37:51 -0400
commit2d4e6f6ad2b9f84f568d07dae4bdbc7f48a70ad1 (patch)
treeeb1490b2b5383fc92eaf276ef31011ec206a2439 /fs/btrfs
parentdac97e516c617f9c797f64b0224050b70aea30c7 (diff)
Btrfs: fix return value of setflags ioctl
setflags ioctl should return error when any checks fail. Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com> Reviewed-by: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/ioctl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 649f47d2afb4..6b70e0e2bd1e 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -247,9 +247,11 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
247 btrfs_end_transaction(trans, root); 247 btrfs_end_transaction(trans, root);
248 248
249 mnt_drop_write(file->f_path.mnt); 249 mnt_drop_write(file->f_path.mnt);
250
251 ret = 0;
250 out_unlock: 252 out_unlock:
251 mutex_unlock(&inode->i_mutex); 253 mutex_unlock(&inode->i_mutex);
252 return 0; 254 return ret;
253} 255}
254 256
255static int btrfs_ioctl_getversion(struct file *file, int __user *arg) 257static int btrfs_ioctl_getversion(struct file *file, int __user *arg)