dev.c (4f2c0a4acffbec01079c28f839422e64ddeff004) dev.c (0718afd47f70cf46877c39c25d06b786e1a3f36c)
1// SPDX-License-Identifier: GPL-2.0
2/*
3 * Copyright (c) 2014-2016 Christoph Hellwig.
4 */
5#include <linux/sunrpc/svc.h>
6#include <linux/blkdev.h>
7#include <linux/nfs4.h>
8#include <linux/nfs_fs.h>

--- 229 unchanged lines hidden (view full) ---

238 struct pnfs_block_volume *v = &volumes[idx];
239 struct block_device *bdev;
240 dev_t dev;
241
242 dev = bl_resolve_deviceid(server, v, gfp_mask);
243 if (!dev)
244 return -EIO;
245
1// SPDX-License-Identifier: GPL-2.0
2/*
3 * Copyright (c) 2014-2016 Christoph Hellwig.
4 */
5#include <linux/sunrpc/svc.h>
6#include <linux/blkdev.h>
7#include <linux/nfs4.h>
8#include <linux/nfs_fs.h>

--- 229 unchanged lines hidden (view full) ---

238 struct pnfs_block_volume *v = &volumes[idx];
239 struct block_device *bdev;
240 dev_t dev;
241
242 dev = bl_resolve_deviceid(server, v, gfp_mask);
243 if (!dev)
244 return -EIO;
245
246 bdev = blkdev_get_by_dev(dev, FMODE_READ | FMODE_WRITE, NULL);
246 bdev = blkdev_get_by_dev(dev, FMODE_READ | FMODE_WRITE, NULL, NULL);
247 if (IS_ERR(bdev)) {
248 printk(KERN_WARNING "pNFS: failed to open device %d:%d (%ld)\n",
249 MAJOR(dev), MINOR(dev), PTR_ERR(bdev));
250 return PTR_ERR(bdev);
251 }
252 d->bdev = bdev;
253
254

--- 52 unchanged lines hidden (view full) ---

307 struct block_device *bdev;
308 const char *devname;
309
310 devname = kasprintf(GFP_KERNEL, "/dev/disk/by-id/%s%*phN",
311 prefix, v->scsi.designator_len, v->scsi.designator);
312 if (!devname)
313 return ERR_PTR(-ENOMEM);
314
247 if (IS_ERR(bdev)) {
248 printk(KERN_WARNING "pNFS: failed to open device %d:%d (%ld)\n",
249 MAJOR(dev), MINOR(dev), PTR_ERR(bdev));
250 return PTR_ERR(bdev);
251 }
252 d->bdev = bdev;
253
254

--- 52 unchanged lines hidden (view full) ---

307 struct block_device *bdev;
308 const char *devname;
309
310 devname = kasprintf(GFP_KERNEL, "/dev/disk/by-id/%s%*phN",
311 prefix, v->scsi.designator_len, v->scsi.designator);
312 if (!devname)
313 return ERR_PTR(-ENOMEM);
314
315 bdev = blkdev_get_by_path(devname, FMODE_READ | FMODE_WRITE, NULL);
315 bdev = blkdev_get_by_path(devname, FMODE_READ | FMODE_WRITE, NULL,
316 NULL);
316 if (IS_ERR(bdev)) {
317 pr_warn("pNFS: failed to open device %s (%ld)\n",
318 devname, PTR_ERR(bdev));
319 }
320
321 kfree(devname);
322 return bdev;
323}

--- 205 unchanged lines hidden --- 		317 if (IS_ERR(bdev)) {
318 pr_warn("pNFS: failed to open device %s (%ld)\n",
319 devname, PTR_ERR(bdev));
320 }
321
322 kfree(devname);
323 return bdev;
324}

--- 205 unchanged lines hidden ---