Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af283885 authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

pnfsblock: cleanup nfs4_blkdev_get 



It is not needed at all and it is messing with return values...

Reported-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 1fd937bd

fs/nfs/blocklayout/blocklayout.h

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ struct bl_msg_hdr { 
/* blocklayoutdev.c */

ssize_t bl_pipe_downcall(struct file *, const char __user *, size_t);

void bl_pipe_destroy_msg(struct rpc_pipe_msg *);

struct block_device *nfs4_blkdev_get(dev_t dev);

int nfs4_blkdev_put(struct block_device *bdev);

struct pnfs_block_dev *nfs4_blk_decode_device(struct nfs_server *server,

						struct pnfs_device *dev);

fs/nfs/blocklayout/blocklayoutdev.c

+5 −20
Original line number Diff line number Diff line
@@ -53,22 +53,6 @@ static int decode_sector_number(__be32 **rp, sector_t *sp) 
	return 0;

}



/* Open a block_device by device number. */

struct block_device *nfs4_blkdev_get(dev_t dev)

{

	struct block_device *bd;



	dprintk("%s enter\n", __func__);

	bd = blkdev_get_by_dev(dev, FMODE_READ, NULL);

	if (IS_ERR(bd))

		goto fail;

	return bd;

fail:

	dprintk("%s failed to open device : %ld\n",

			__func__, PTR_ERR(bd));

	return NULL;

}



/*

 * Release the block device

 */
@@ -172,11 +156,12 @@ nfs4_blk_decode_device(struct nfs_server *server, 
		goto out;

	}



	bd = nfs4_blkdev_get(MKDEV(reply->major, reply->minor));

	bd = blkdev_get_by_dev(MKDEV(reply->major, reply->minor),

			       FMODE_READ, NULL);

	if (IS_ERR(bd)) {

		rc = PTR_ERR(bd);

		dprintk("%s failed to open device : %d\n", __func__, rc);

		rv = ERR_PTR(rc);

		dprintk("%s failed to open device : %ld\n", __func__,

			PTR_ERR(bd));

		rv = ERR_CAST(bd);

		goto out;

	}