summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-04-29 15:05:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 15:54:27 -0700
commit7ebab4536958b05f65b71ec312073acf5d66578d (patch)
tree46d9f64f5547944b5f367c7d1f4eee3bf31082bc
parentb3e0767abcd6eda32cdfd9c6a6b9e53b4ddf6d4d (diff)
downloadop-kernel-dev-7ebab4536958b05f65b71ec312073acf5d66578d.zip
op-kernel-dev-7ebab4536958b05f65b71ec312073acf5d66578d.tar.gz
ocfs2: fix error return code in ocfs2_info_handle_freefrag()
Fix to return a negative error code from the error handling case instead of 0, as returned elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Cc: Joel Becker <jlbec@evilplan.org> Cc: Mark Fasheh <mfasheh@suse.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/ocfs2/ioctl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c
index 6cab301..0c60ef2 100644
--- a/fs/ocfs2/ioctl.c
+++ b/fs/ocfs2/ioctl.c
@@ -706,8 +706,10 @@ int ocfs2_info_handle_freefrag(struct inode *inode,
o2info_set_request_filled(&oiff->iff_req);
- if (o2info_to_user(*oiff, req))
+ if (o2info_to_user(*oiff, req)) {
+ status = -EFAULT;
goto bail;
+ }
status = 0;
bail:
OpenPOWER on IntegriCloud