Re: [PATCH] pnfsd-block: cause oops when alloc pnfs_blocklayout_layout_t fail

[Benny Halevy <bhalevy@tonian.com>]

On 2013-03-26 12:36, fanchaoting wrote:
> if using dprintk and alloc pnfs_blocklayout_layout_t fail, it
> maybe cause oops. we should assert the new pnfs_blocklayout_layout_t
> is not null first.
> 
>  Signed-off-by: fanchaoting <fanchaoting@cn.fujitsu.com>
>  Reviewed-by: chendt.fnst <chendt.fnst@cn.fujitsu.com>

Merged into the pnfsd-block branch.

Thanks,

Benny


> ---
>  fs/nfsd/bl_ops.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/nfsd/bl_ops.c b/fs/nfsd/bl_ops.c
> index fa129e8..a7046c6 100644
> --- a/fs/nfsd/bl_ops.c
> +++ b/fs/nfsd/bl_ops.c
> @@ -1210,14 +1210,14 @@ layout_cache_fill_from_list(bl_layout_rec_t *r, struct list_head *h,
>  			n = bll_alloc(seg->offset,
>  			    MIN(seg->length, BLL_F_END(b) - seg->offset),
>  			    BLOCK_LAYOUT_CACHE, h);
> +			if (!n)
> +				return False;
> +
>  			dprintk("  CACHE hit: Found %Lu(f):%Lu(l): "
>  			    "in %Lu(f):%Lu(l):%Lu(s):%d\n",
>  			    _2SECTS(n->bll_foff), _2SECTS(n->bll_len),
>  			    _2SECTS(b->bll_foff), _2SECTS(b->bll_len),
>  			    _2SECTS(b->bll_soff), b->bll_es);
> -			if (!n)
> -				return False;
> -			
>  			n->bll_soff = b->bll_soff + seg->offset - b->bll_foff;
>  			n->bll_vol_id.sbid = sbid;
>  			n->bll_vol_id.devid = b->bll_vol_id.devid;
>