Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pnfsblock: cleanup nfs4_blkdev_get

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

Reported-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Peng Tao 2012-09-25 14:55:57 +08:00 committed by Trond Myklebust
parent 1fd937bd75
commit af283885b7
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/nfs/blocklayout/blocklayout.h
View File

@ -173,7 +173,6 @@ struct bl_msg_hdr {
/* blocklayoutdev.c */ /* blocklayoutdev.c */
ssize_t bl_pipe_downcall(struct file *, const char __user *, size_t); ssize_t bl_pipe_downcall(struct file *, const char __user *, size_t);
void bl_pipe_destroy_msg(struct rpc_pipe_msg *); 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); int nfs4_blkdev_put(struct block_device *bdev);
struct pnfs_block_dev *nfs4_blk_decode_device(struct nfs_server *server, struct pnfs_block_dev *nfs4_blk_decode_device(struct nfs_server *server,
struct pnfs_device *dev); struct pnfs_device *dev);

25
fs/nfs/blocklayout/blocklayoutdev.c
View File

@ -53,22 +53,6 @@ static int decode_sector_number(__be32 **rp, sector_t *sp)
return 0; 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 * Release the block device
*/ */
@ -172,11 +156,12 @@ nfs4_blk_decode_device(struct nfs_server *server,
goto out; 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)) { if (IS_ERR(bd)) {
rc = PTR_ERR(bd); dprintk("%s failed to open device : %ld\n", __func__,
dprintk("%s failed to open device : %d\n", __func__, rc); PTR_ERR(bd));
rv = ERR_PTR(rc); rv = ERR_CAST(bd);
goto out; goto out;
} }