diff options
author | Wei Yongjun | 2013-03-11 10:01:37 -0500 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-04-16 23:48:28 -0500 |
commit | 16deae329e6b9a0a500d70c0cc4023c799b644d9 (patch) | |
tree | 14bed01e332e5fd62191cfff26db65334d881acc /fs | |
parent | a7d0c9176bb6e15c483a020816b2ecb60716f79a (diff) | |
download | kernel-omap-16deae329e6b9a0a500d70c0cc4023c799b644d9.tar.gz kernel-omap-16deae329e6b9a0a500d70c0cc4023c799b644d9.tar.xz kernel-omap-16deae329e6b9a0a500d70c0cc4023c799b644d9.zip |
GFS2: return error if malloc failed in gfs2_rs_alloc()
commit 441362d06be349430d06e37286adce4b90e6ce96 upstream.
The error code in gfs2_rs_alloc() is set to ENOMEM when error
but never be used, instead, gfs2_rs_alloc() always return 0.
Fix to return 'error'.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/gfs2/rgrp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index b7eff078fe90..9afba3d63dff 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
@@ -576,7 +576,7 @@ int gfs2_rs_alloc(struct gfs2_inode *ip) | |||
576 | RB_CLEAR_NODE(&ip->i_res->rs_node); | 576 | RB_CLEAR_NODE(&ip->i_res->rs_node); |
577 | out: | 577 | out: |
578 | up_write(&ip->i_rw_mutex); | 578 | up_write(&ip->i_rw_mutex); |
579 | return 0; | 579 | return error; |
580 | } | 580 | } |
581 | 581 | ||
582 | static void dump_rs(struct seq_file *seq, const struct gfs2_blkreserv *rs) | 582 | static void dump_rs(struct seq_file *seq, const struct gfs2_blkreserv *rs) |