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>

diff --git a/fs/nfs/blocklayout/blocklayoutdev.c b/fs/nfs/blocklayout/blocklayoutdev.c
index 04303b5c93618b9ad9c73bbde74e4f64e64c684f..63f77925aa87977a0b1f0153445751f5315c235a 100644 (file)
--- a/fs/nfs/blocklayout/blocklayoutdev.c
+++ b/fs/nfs/blocklayout/blocklayoutdev.c
@@ -150,7 +150,7 @@ nfs4_blk_decode_device(struct nfs_server *server,
        remove_wait_queue(&nn->bl_wq, &wq);
 
        if (reply->status != BL_DEVICE_REQUEST_PROC) {
-               dprintk("%s failed to open device: %d\n",
+               printk(KERN_WARNING "%s failed to decode device: %d\n",
                        __func__, reply->status);
                rv = ERR_PTR(-EINVAL);
                goto out;
@@ -159,7 +159,8 @@ nfs4_blk_decode_device(struct nfs_server *server,
        bd = blkdev_get_by_dev(MKDEV(reply->major, reply->minor),
                               FMODE_READ, NULL);
        if (IS_ERR(bd)) {
-               dprintk("%s failed to open device : %ld\n", __func__,
+               printk(KERN_WARNING "%s failed to open device %d:%d (%ld)\n",
+                       __func__, reply->major, reply->minor,
                        PTR_ERR(bd));
                rv = ERR_CAST(bd);
                goto out;