NFSv4: Don't send delegation-related share access modes to CLOSE

When we set the new share access modes for CLOSE in nfs4_close_prepare().
we should only set a mode of NFS4_SHARE_ACCESS_READ, NFS4_SHARE_ACCESS_WRITE
or NFS4_SHARE_ACCESS_BOTH. Currently, we may also be passing in the NFSv4.1
share modes for controlling delegation requests in OPEN, which is wrong.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 9376b5031acfd722d00a7e5656d47bd95f6f4c16..26758acba3a665eecf020ddb102df3d84cdff644 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1333,8 +1333,7 @@ static fmode_t _nfs4_ctx_to_openmode(const struct nfs_open_context *ctx)
 }
 
 static u32
-nfs4_map_atomic_open_share(struct nfs_server *server,
-               fmode_t fmode, int openflags)
+nfs4_fmode_to_share_access(fmode_t fmode)
 {
        u32 res = 0;
 
@@ -1348,6 +1347,15 @@ nfs4_map_atomic_open_share(struct nfs_server *server,
        case FMODE_READ|FMODE_WRITE:
                res = NFS4_SHARE_ACCESS_BOTH;
        }
+       return res;
+}
+
+static u32
+nfs4_map_atomic_open_share(struct nfs_server *server,
+               fmode_t fmode, int openflags)
+{
+       u32 res = nfs4_fmode_to_share_access(fmode);
+
        if (!(server->caps & NFS_CAP_ATOMIC_OPEN_V1))
                goto out;
        /* Want no delegation if we're using O_DIRECT */
@@ -3753,8 +3761,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data)
        }
 
        calldata->arg.share_access =
-               nfs4_map_atomic_open_share(NFS_SERVER(inode),
-                               calldata->arg.fmode, 0);
+               nfs4_fmode_to_share_access(calldata->arg.fmode);
 
        if (calldata->res.fattr == NULL)
                calldata->arg.bitmask = NULL;