NFS: start printks w/ NFS: even if __func__ shown

[linux-imx.git] / fs / nfs / blocklayout / blocklayoutdm.c

diff --git a/fs/nfs/blocklayout/blocklayoutdm.c b/fs/nfs/blocklayout/blocklayoutdm.c
index d055c75580734853a29ae2b3553d5c0268bf44f9..a0f588fa49c14d9cedda52f8dd349b4cd5266bb2 100644 (file)
--- a/fs/nfs/blocklayout/blocklayoutdm.c
+++ b/fs/nfs/blocklayout/blocklayoutdm.c
@@ -38,7 +38,7 @@
 
 #define NFSDBG_FACILITY         NFSDBG_PNFS_LD
 
-static void dev_remove(dev_t dev)
+static void dev_remove(struct net *net, dev_t dev)
 {
        struct rpc_pipe_msg msg;
        struct bl_dev_msg bl_umount_request;
@@ -48,6 +48,7 @@ static void dev_remove(dev_t dev)
        };
        uint8_t *dataptr;
        DECLARE_WAITQUEUE(wq, current);
+       struct nfs_net *nn = net_generic(net, nfs_net_id);
 
        dprintk("Entering %s\n", __func__);
 
@@ -66,7 +67,7 @@ static void dev_remove(dev_t dev)
        msg.len = sizeof(bl_msg) + bl_msg.totallen;
 
        add_wait_queue(&bl_wq, &wq);
-       if (rpc_queue_upcall(bl_device_pipe->d_inode, &msg) < 0) {
+       if (rpc_queue_upcall(nn->bl_device_pipe, &msg) < 0) {
                remove_wait_queue(&bl_wq, &wq);
                goto out;
        }
@@ -90,10 +91,10 @@ static void nfs4_blk_metadev_release(struct pnfs_block_dev *bdev)
        dprintk("%s Releasing\n", __func__);
        rv = nfs4_blkdev_put(bdev->bm_mdev);
        if (rv)
-               printk(KERN_ERR "%s nfs4_blkdev_put returns %d\n",
+               printk(KERN_ERR "NFS: %s nfs4_blkdev_put returns %d\n",
                                __func__, rv);
 
-       dev_remove(bdev->bm_mdev->bd_dev);
+       dev_remove(bdev->net, bdev->bm_mdev->bd_dev);
 }
 
 void bl_free_block_dev(struct pnfs_block_dev *bdev)