2013-03-11 15:01:40

by Wei Yongjun

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

From: Wei Yongjun <[email protected]>

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]>
---
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 9d16a6f..b850198 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)

2013-03-11 16:11:18

by Steven Whitehouse

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

Hi,

Now in the GFS2 -nmw tree. Thanks,

Steve.

On Mon, 2013-03-11 at 23:01 +0800, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> 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]>
> ---
> 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 9d16a6f..b850198 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)
>
>