2013-04-11 02:03:08

by Jonghwan Choi

Subject: [PATCH 3.8-stable] GFS2: return error if malloc failed in gfs2_rs_alloc()

This patch looks like it should be in the 3.8-stable tree, should we apply
it?

------------------

From: "Wei Yongjun <[email protected]>"

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 <[email protected]>
Signed-off-by: Steven Whitehouse <[email protected]>
Signed-off-by: Jonghwan Choi <[email protected]>
---
fs/gfs2/rgrp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index b7eff07..9afba3d6 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -576,7 +576,7 @@ int gfs2_rs_alloc(struct gfs2_inode *ip)
RB_CLEAR_NODE(&ip->i_res->rs_node);
out:
up_write(&ip->i_rw_mutex);
- return 0;
+ return error;
}

static void dump_rs(struct seq_file *seq, const struct gfs2_blkreserv *rs)
--
1.7.9.5

2013-04-11 08:02:20

by Steven Whitehouse

Subject: Re: [PATCH 3.8-stable] GFS2: return error if malloc failed in gfs2_rs_alloc()

Hi,

On Thu, 2013-04-11 at 11:03 +0900, Jonghwan Choi wrote:
> This patch looks like it should be in the 3.8-stable tree, should we apply
> it?
>
Yes, again looks like a good plan,

Steve.

> ------------------
>
> From: "Wei Yongjun <[email protected]>"
>
> 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 <[email protected]>
> Signed-off-by: Steven Whitehouse <[email protected]>
> Signed-off-by: Jonghwan Choi <[email protected]>
> ---
> fs/gfs2/rgrp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
> index b7eff07..9afba3d6 100644
> --- a/fs/gfs2/rgrp.c
> +++ b/fs/gfs2/rgrp.c
> @@ -576,7 +576,7 @@ int gfs2_rs_alloc(struct gfs2_inode *ip)
> RB_CLEAR_NODE(&ip->i_res->rs_node);
> out:
> up_write(&ip->i_rw_mutex);
> - return 0;
> + return error;
> }
>
> static void dump_rs(struct seq_file *seq, const struct gfs2_blkreserv *rs)