3 files changed, 12 insertions, 9 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 627f37c44456..ba8b2b5e98a1 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7944,6 +7944,8 @@ _nfs4_proc_getdeviceinfo(struct nfs_server *server,
 {
         struct nfs4_getdeviceinfo_args args = {
                 .pdev = pdev,
+                .notify_types = NOTIFY_DEVICEID4_CHANGE |
+                        NOTIFY_DEVICEID4_DELETE,
         };
         struct nfs4_getdeviceinfo_res res = {
                 .pdev = pdev,
@@ -7958,6 +7960,9 @@ _nfs4_proc_getdeviceinfo(struct nfs_server *server,
 
         dprintk("--> %s\n", __func__);
         status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 0);
+        if (res.notification & ~args.notify_types)
+                dprintk("%s: unsupported notification\n", __func__);
+
         dprintk("<-- %s status=%d\n", __func__, status);
 
         return status;
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 5c399ec41079..6b28a605c697 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1920,7 +1920,7 @@ encode_getdeviceinfo(struct xdr_stream *xdr,
 
         p = reserve_space(xdr, 4 + 4);
         *p++ = cpu_to_be32(1);                  /* bitmap length */
-        *p++ = cpu_to_be32(NOTIFY_DEVICEID4_CHANGE | NOTIFY_DEVICEID4_DELETE);
+        *p++ = cpu_to_be32(args->notify_types);
 }
 
 static void
@@ -5753,8 +5753,9 @@ out_overflow:
 
 #if defined(CONFIG_NFS_V4_1)
 static int decode_getdeviceinfo(struct xdr_stream *xdr,
-                                struct pnfs_device *pdev)
+                                struct nfs4_getdeviceinfo_res *res)
 {
+        struct pnfs_device *pdev = res->pdev;
         __be32 *p;
         uint32_t len, type;
         int status;
@@ -5802,12 +5803,7 @@ static int decode_getdeviceinfo(struct xdr_stream *xdr,
                 if (unlikely(!p))
                         goto out_overflow;
 
-                if (be32_to_cpup(p++) &
-                    ~(NOTIFY_DEVICEID4_CHANGE | NOTIFY_DEVICEID4_DELETE)) {
-                        dprintk("%s: unsupported notification\n",
-                                __func__);
-                }
-
+                res->notification = be32_to_cpup(p++);
                 for (i = 1; i < len; i++) {
                         if (be32_to_cpup(p++)) {
                                 dprintk("%s: unsupported notification\n",
@@ -7061,7 +7057,7 @@ static int nfs4_xdr_dec_getdeviceinfo(struct rpc_rqst *rqstp,
         status = decode_sequence(xdr, &res->seq_res, rqstp);
         if (status != 0)
                 goto out;
-        status = decode_getdeviceinfo(xdr, res->pdev);
+        status = decode_getdeviceinfo(xdr, res);
 out:
         return status;
 }
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 4cb3eaa89cf7..3d88908fd140 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -255,11 +255,13 @@ struct nfs4_layoutget {
 struct nfs4_getdeviceinfo_args {
         struct nfs4_sequence_args seq_args;
         struct pnfs_device *pdev;
+        __u32 notify_types;
 };
 
 struct nfs4_getdeviceinfo_res {
         struct nfs4_sequence_res seq_res;
         struct pnfs_device *pdev;
+        __u32 notification;
 };
 
 struct nfs4_layoutcommit_args {