nfs/blocklayout: refactor block device opening
Subsystems (2)
PATCH 1/1 nfs/blocklayout: refactor block device opening
Deduplicate the helpers to open a device node by passing a name prefix argument and using the same helper for both kinds of paths.
--- fs/nfs/blocklayout/dev.c | 42 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 31 deletions(-)
fs/nfs/blocklayout/dev.c +11 -31
@@ -301,18 +301,14 @@ bl_validate_designator(struct pnfs_block_volume *v) } } -/* -* Try to open the udev path for the WWN. At least on Debian the udev -* by-id path will always point to the dm-multipath device if one exists. -*/ static struct block_device * -bl_open_udev_path (struct pnfs_block_volume *v) +bl_open_path (struct pnfs_block_volume *v,const char *prefix) {struct block_device *bdev;const char *devname; - devname =kasprintf (GFP_KERNEL ,"/dev/disk/by-id/wwn-0x%*phN" , - v->scsi.designator_len, v->scsi.designator); + devname =kasprintf (GFP_KERNEL ,"/dev/disk/by-id/%s%*phN" , + prefix, v->scsi.designator_len, v->scsi.designator);if (!devname)return ERR_PTR (-ENOMEM );
@@ -326,28 +322,6 @@ bl_open_udev_path(struct pnfs_block_volume *v)return bdev; } -/* -* Try to open the RH/Fedora specific dm-mpath udev path for this WWN, as the -* wwn- links will only point to the first discovered SCSI device there. -*/ -static struct block_device * -bl_open_dm_mpath_udev_path (struct pnfs_block_volume *v) -{ -struct block_device *bdev; -const char *devname; - - devname =kasprintf (GFP_KERNEL , -"/dev/disk/by-id/dm-uuid-mpath-%d%*phN" , - v->scsi.designator_type, - v->scsi.designator_len, v->scsi.designator); -if (!devname) -return ERR_PTR (-ENOMEM ); - - bdev =blkdev_get_by_path (devname,FMODE_READ |FMODE_WRITE ,NULL ); -kfree (devname); -return bdev; -} -static int bl_parse_scsi (struct nfs_server *server,struct pnfs_block_dev *d,struct pnfs_block_volume *volumes,int idx,gfp_t gfp_mask)
@@ -360,9 +334,15 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d,if (!bl_validate_designator (v))return -EINVAL ; - bdev =bl_open_dm_mpath_udev_path (v); +/* +* Try to open the RH/Fedora specific dm-mpath udev path first, as the +* wwn- links will only point to the first discovered SCSI device there. +* On other distributions like Debian, the default SCSI by-id path will +* point to the dm-multipath device if one exists. +*/ + bdev =bl_open_path (v,"dm-uuid-mpath-0x" );if (IS_ERR (bdev)) - bdev =bl_open_udev_path (v); + bdev =bl_open_path (v,"wwn-0x" );if (IS_ERR (bdev))return PTR_ERR (bdev); d->bdev = bdev;
Signature · 1 line
2.30.2
ping?
Quoted 83 lines · Christoph Hellwig
Deduplicate the helpers to open a device node by passing a name prefix argument and using the same helper for both kinds of paths.
Signed-off-by Christoph Hellwig <[email protected]>--- fs/nfs/blocklayout/dev.c | 42 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 31 deletions(-)fs/nfs/blocklayout/dev.c +11
-31@@ -301,18 +301,14 @@ bl_validate_designator(struct pnfs_block_volume *v) } } -/* -* Try to open the udev path for the WWN. At least on Debian the udev -* by-id path will always point to the dm-multipath device if one exists. -*/ static struct block_device * -bl_open_udev_path (struct pnfs_block_volume *v) +bl_open_path (struct pnfs_block_volume *v,const char *prefix) {struct block_device *bdev;const char *devname; - devname =kasprintf (GFP_KERNEL ,"/dev/disk/by-id/wwn-0x%*phN" , - v->scsi.designator_len, v->scsi.designator); + devname =kasprintf (GFP_KERNEL ,"/dev/disk/by-id/%s%*phN" , + prefix, v->scsi.designator_len, v->scsi.designator);if (!devname)return ERR_PTR (-ENOMEM );@@ -326,28 +322,6 @@ bl_open_udev_path(struct pnfs_block_volume *v)return bdev; } -/* -* Try to open the RH/Fedora specific dm-mpath udev path for this WWN, as the -* wwn- links will only point to the first discovered SCSI device there. -*/ -static struct block_device * -bl_open_dm_mpath_udev_path (struct pnfs_block_volume *v) -{ -struct block_device *bdev; -const char *devname; - - devname =kasprintf (GFP_KERNEL , -"/dev/disk/by-id/dm-uuid-mpath-%d%*phN" , - v->scsi.designator_type, - v->scsi.designator_len, v->scsi.designator); -if (!devname) -return ERR_PTR (-ENOMEM ); - - bdev =blkdev_get_by_path (devname,FMODE_READ |FMODE_WRITE ,NULL ); -kfree (devname); -return bdev; -} -static int bl_parse_scsi (struct nfs_server *server,struct pnfs_block_dev *d,struct pnfs_block_volume *volumes,int idx,gfp_t gfp_mask)@@ -360,9 +334,15 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d,if (!bl_validate_designator (v))return -EINVAL ; - bdev =bl_open_dm_mpath_udev_path (v); +/* +* Try to open the RH/Fedora specific dm-mpath udev path first, as the +* wwn- links will only point to the first discovered SCSI device there. +* On other distributions like Debian, the default SCSI by-id path will +* point to the dm-multipath device if one exists. +*/ + bdev =bl_open_path (v,"dm-uuid-mpath-0x" );if (IS_ERR (bdev)) - bdev =bl_open_udev_path (v); + bdev =bl_open_path (v,"wwn-0x" );if (IS_ERR (bdev))return PTR_ERR (bdev); d->bdev = bdev;Signature · 1 line
2.30.2
---end quoted text---
Quoted 1 line · Christoph Hellwig
ping?
Queued for the next merge window, and should already be appearing in linux-next.
Quoted 102 lines · Christoph Hellwig
Quoted 89 lines
Deduplicate the helpers to open a device node by passing a name prefix argument and using the same helper for both kinds of paths.
Signed-off-by Christoph Hellwig <[email protected]>---
fs/nfs/blocklayout/dev.c | 42 +++++++++++-------------------------
----1 file changed, 11 insertions(+), 31 deletions(-)fs/nfs/blocklayout/dev.c +0
-0@@ -301,18 +301,14 @@ bl_validate_designator(struct pnfs_block_volume *v) } }
-/*
- * Try to open the udev path for the WWN. At least on Debian the udev
- * by-id path will always point to the dm-multipath device if one exists.
- */
static structblock_device*fs/nfs/blocklayout/dev.c +1
-1-bl_open_udev_path(struct pnfs_block_volume *v) +bl_open_path(struct pnfs_block_volume *v, const char *prefix){
structblock_device*bdev;
const char *devname;
- devname = kasprintf(GFP_KERNEL, "/dev/disk/by-id/wwn-0x%*phN",
- v->scsi.designator_len, v-Quoted 1 line
scsi.designator);
+ devname = kasprintf(GFP_KERNEL, "/dev/disk/by-id/%s%*phN", + prefix,
v->scsi.designator_len, v-Quoted 1 line
scsi.designator);
if (!devname)
returnERR_PTR(-ENOMEM);fs/nfs/blocklayout/dev.c +0
-0@@ -326,28 +322,6 @@ bl_open_udev_path(struct pnfs_block_volume *v) return bdev; }
-/*
- * Try to open the RH/Fedora specific dm-mpath udev path for this WWN, as the
- * wwn- links will only point to the first discovered SCSI device there.
- */fs/nfs/blocklayout/dev.c +0
-10-static struct block_device * -bl_open_dm_mpath_udev_path (struct pnfs_block_volume *v) -{ - struct block_device *bdev; - const char *devname; - - devname = kasprintf(GFP_KERNEL, - "/dev/disk/by-id/dm-uuid-mpath-%d%*phN", - v->scsi.designator_type, - v->scsi.designator_len, v-Quoted 1 line
scsi.designator);
- if (!devname)
- returnERR_PTR(-ENOMEM);
-
- bdev =blkdev_get_by_path(devname, FMODE_READ | FMODE_WRITE, NULL);
- kfree(devname);
- return bdev;fs/nfs/blocklayout/dev.c +0
-2-} -static int
bl_parse_scsi(structnfs_server*server, structpnfs_block_dev*d, structpnfs_block_volume*volumes, int idx,gfp_tgfp_mask)fs/nfs/blocklayout/dev.c +0
-0@@ -360,9 +334,15 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d, if (!bl_validate_designator(v)) return -EINVAL;
- bdev =bl_open_dm_mpath_udev_path(v);
+ /*
+ * Try to open the RH/Fedora specific dm-mpath udev path first, as the
+ * wwn- links will only point to the first discovered SCSI device there.
+ * On other distributions like Debian, the default SCSI by- id path will
+ * point to the dm-multipath device if one exists.Quoted 10 lines
+ */
+ bdev =bl_open_path(v, "dm-uuid-mpath-0x"); if (IS_ERR(bdev))
- bdev =bl_open_udev_path(v); + bdev =bl_open_path(v, "wwn-0x"); if (IS_ERR(bdev))
returnPTR_ERR(bdev);d->bdev= bdev;Signature · 1 line
2.30.2---end quoted text---
Signature · 3 lines
Trond Myklebust Linux NFS client maintainer, Hammerspace [email protected]