NFSv4.1: use layout driver in global device cache

pnfs deviceids are unique per server, per layout type.
struct nfs_client is currently used to distinguish deviceids from
different nfs servers, yet these may clash between different layout
types on the same server.  Therefore, use the layout driver associated
with each deviceid at insertion time to look it up, unhash, or
delete it.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index fb5e5b9a97ae..c73e7b2fb8e2 100644
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -278,7 +278,7 @@ __be32 nfs4_callback_devicenotify(struct cb_devicenotifyargs *args,
                 if (dev->cbd_notify_type == NOTIFY_DEVICEID4_CHANGE)
                         dprintk("%s: NOTIFY_DEVICEID4_CHANGE not supported, "
                                 "deleting instead\n", __func__);
-                nfs4_delete_deviceid(clp, &dev->cbd_dev_id);
+                nfs4_delete_deviceid(server->pnfs_curr_ld, clp, &dev->cbd_dev_id);
         }
 
 out: