From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> In case of error, the function nfs4_blkdev_get() return NULL pointer. But the user nfs4_blk_decode_device() check the return value by using IS_ERR() and get error code from the return value. So we should better change the return value of nfs4_blkdev_get() to return ERR_PTR(). dpatch engine is used to auto generate this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> --- fs/nfs/blocklayout/blocklayoutdev.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayoutdev.c b/fs/nfs/blocklayout/blocklayoutdev.c index c965542..8c51518 100644 --- a/fs/nfs/blocklayout/blocklayoutdev.c +++ b/fs/nfs/blocklayout/blocklayoutdev.c @@ -61,12 +61,9 @@ struct block_device *nfs4_blkdev_get(dev_t dev) dprintk("%s enter\n", __func__); bd = blkdev_get_by_dev(dev, FMODE_READ, NULL); if (IS_ERR(bd)) - goto fail; + dprintk("%s failed to open device : %ld\n", + __func__, PTR_ERR(bd)); return bd; -fail: - dprintk("%s failed to open device : %ld\n", - __func__, PTR_ERR(bd)); - return NULL; } /* -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
