aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-08-21 12:09:27 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-09-10 15:47:02 -0400
commit72c5e59f63ceaa604936b1693ba8c4b6cc2b114d (patch)
treec6faeade7cf9d2e71a1351d29c922730335a5433
parente3aaf7f2b8e9e858c0d6626577d3456bf6070e5a (diff)
pnfs/blocklayout: improve GETDEVICEINFO error reporting
Tell userspace what stage of GETDEVICEINFO failed so that there is a chance to debug it, especially with the userspace daemon clusterf***k in the block layout driver. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--fs/nfs/blocklayout/blocklayoutdev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/blocklayout/blocklayoutdev.c b/fs/nfs/blocklayout/blocklayoutdev.c
index 04303b5c9361..63f77925aa87 100644
--- a/fs/nfs/blocklayout/blocklayoutdev.c
+++ b/fs/nfs/blocklayout/blocklayoutdev.c
@@ -150,7 +150,7 @@ nfs4_blk_decode_device(struct nfs_server *server,
150 remove_wait_queue(&nn->bl_wq, &wq); 150 remove_wait_queue(&nn->bl_wq, &wq);
151 151
152 if (reply->status != BL_DEVICE_REQUEST_PROC) { 152 if (reply->status != BL_DEVICE_REQUEST_PROC) {
153 dprintk("%s failed to open device: %d\n", 153 printk(KERN_WARNING "%s failed to decode device: %d\n",
154 __func__, reply->status); 154 __func__, reply->status);
155 rv = ERR_PTR(-EINVAL); 155 rv = ERR_PTR(-EINVAL);
156 goto out; 156 goto out;
@@ -159,7 +159,8 @@ nfs4_blk_decode_device(struct nfs_server *server,
159 bd = blkdev_get_by_dev(MKDEV(reply->major, reply->minor), 159 bd = blkdev_get_by_dev(MKDEV(reply->major, reply->minor),
160 FMODE_READ, NULL); 160 FMODE_READ, NULL);
161 if (IS_ERR(bd)) { 161 if (IS_ERR(bd)) {
162 dprintk("%s failed to open device : %ld\n", __func__, 162 printk(KERN_WARNING "%s failed to open device %d:%d (%ld)\n",
163 __func__, reply->major, reply->minor,
163 PTR_ERR(bd)); 164 PTR_ERR(bd));
164 rv = ERR_CAST(bd); 165 rv = ERR_CAST(bd);
165 goto out; 166 goto out;