NFSv4.2: support EXCHGID4_FLAG_SUPP_FENCE_OPS 4.2 EXCHANGE_ID flag

RFC 7862 introduced a new flag that either client or server is
allowed to set: EXCHGID4_FLAG_SUPP_FENCE_OPS.

Client needs to update its bitmask to allow for this flag value.

v2: changed minor version argument to unsigned int

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
CC: <stable@vger.kernel.org>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 2e33995691f5a42bb2f4c7c65d334e97c747ea1b..9e0ca9b2b210b01e07e40f535b28703b1eaf9ff4 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -8133,9 +8133,11 @@ int nfs4_proc_secinfo(struct inode *dir, const struct qstr *name,
  * both PNFS and NON_PNFS flags set, and not having one of NON_PNFS, PNFS, or
  * DS flags set.
  */
-static int nfs4_check_cl_exchange_flags(u32 flags)
+static int nfs4_check_cl_exchange_flags(u32 flags, u32 version)
 {
-       if (flags & ~EXCHGID4_FLAG_MASK_R)
+       if (version >= 2 && (flags & ~EXCHGID4_2_FLAG_MASK_R))
+               goto out_inval;
+       else if (version < 2 && (flags & ~EXCHGID4_FLAG_MASK_R))
                goto out_inval;
        if ((flags & EXCHGID4_FLAG_USE_PNFS_MDS) &&
            (flags & EXCHGID4_FLAG_USE_NON_PNFS))
@@ -8548,7 +8550,8 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, const struct cred *cre
        if (status  != 0)
                goto out;
 
-       status = nfs4_check_cl_exchange_flags(resp->flags);
+       status = nfs4_check_cl_exchange_flags(resp->flags,
+                       clp->cl_mvops->minor_version);
        if (status  != 0)
                goto out;
 

diff --git a/include/uapi/linux/nfs4.h b/include/uapi/linux/nfs4.h
index bf197e99b98fc3d355f80310495bce9cb08c84e8..ed5415e0f1c1982333450d89910cff57f1201ac4 100644 (file)
--- a/include/uapi/linux/nfs4.h
+++ b/include/uapi/linux/nfs4.h
@@ -139,6 +139,8 @@
 
 #define EXCHGID4_FLAG_UPD_CONFIRMED_REC_A      0x40000000
 #define EXCHGID4_FLAG_CONFIRMED_R              0x80000000
+
+#define EXCHGID4_FLAG_SUPP_FENCE_OPS           0x00000004
 /*
  * Since the validity of these bits depends on whether
  * they're set in the argument or response, have separate
@@ -146,6 +148,7 @@
  */
 #define EXCHGID4_FLAG_MASK_A                   0x40070103
 #define EXCHGID4_FLAG_MASK_R                   0x80070103
+#define EXCHGID4_2_FLAG_MASK_R                 0x80070107
 
 #define SEQ4_STATUS_CB_PATH_DOWN               0x00000001
 #define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRING   0x00000002