lkml.org 
[lkml]   [2020]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 065/170] nfs: add minor version to nfs_server_key for fscache
    Date
    From: Scott Mayhew <smayhew@redhat.com>

    [ Upstream commit 55dee1bc0d72877b99805e42e0205087e98b9edd ]

    An NFS client that mounts multiple exports from the same NFS
    server with higher NFSv4 versions disabled (i.e. 4.2) and without
    forcing a specific NFS version results in fscache index cookie
    collisions and the following messages:
    [ 570.004348] FS-Cache: Duplicate cookie detected

    Each nfs_client structure should have its own fscache index cookie,
    so add the minorversion to nfs_server_key.

    Link: https://bugzilla.kernel.org/show_bug.cgi?id=200145
    Signed-off-by: Scott Mayhew <smayhew@redhat.com>
    Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfs/client.c | 1 +
    fs/nfs/fscache.c | 2 ++
    fs/nfs/nfs4client.c | 1 -
    3 files changed, 3 insertions(+), 1 deletion(-)

    diff --git a/fs/nfs/client.c b/fs/nfs/client.c
    index 02110a30a49ea..a851339defeb5 100644
    --- a/fs/nfs/client.c
    +++ b/fs/nfs/client.c
    @@ -153,6 +153,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)
    if ((clp = kzalloc(sizeof(*clp), GFP_KERNEL)) == NULL)
    goto error_0;

    + clp->cl_minorversion = cl_init->minorversion;
    clp->cl_nfs_mod = cl_init->nfs_mod;
    if (!try_module_get(clp->cl_nfs_mod->owner))
    goto error_dealloc;
    diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c
    index 3800ab6f08fa8..a6dcc2151e779 100644
    --- a/fs/nfs/fscache.c
    +++ b/fs/nfs/fscache.c
    @@ -31,6 +31,7 @@ static DEFINE_SPINLOCK(nfs_fscache_keys_lock);
    struct nfs_server_key {
    struct {
    uint16_t nfsversion; /* NFS protocol version */
    + uint32_t minorversion; /* NFSv4 minor version */
    uint16_t family; /* address family */
    __be16 port; /* IP port */
    } hdr;
    @@ -55,6 +56,7 @@ void nfs_fscache_get_client_cookie(struct nfs_client *clp)

    memset(&key, 0, sizeof(key));
    key.hdr.nfsversion = clp->rpc_ops->version;
    + key.hdr.minorversion = clp->cl_minorversion;
    key.hdr.family = clp->cl_addr.ss_family;

    switch (clp->cl_addr.ss_family) {
    diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
    index 460d6251c405f..2c274fea80937 100644
    --- a/fs/nfs/nfs4client.c
    +++ b/fs/nfs/nfs4client.c
    @@ -216,7 +216,6 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)
    INIT_LIST_HEAD(&clp->cl_ds_clients);
    rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");
    clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;
    - clp->cl_minorversion = cl_init->minorversion;
    clp->cl_mvops = nfs_v4_minor_ops[cl_init->minorversion];
    clp->cl_mig_gen = 1;
    #if IS_ENABLED(CONFIG_NFS_V4_1)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-03-31 11:05    [W:4.195 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site