lkml.org 
[lkml]   [2012]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 4/4] NFS: make nfs_client_lock per net ns
    On 02/07/12 09:11, Myklebust, Trond wrote:

    > On Tue, 2012-02-07 at 18:09 +0400, Stanislav Kinsbursky wrote:
    >> 07.02.2012 17:51, Myklebust, Trond пишет:
    >>> 8<-------------------------------------------------------------------------
    >>> From 5a489156da4fd15dd143f2b21dd9657b97dcef88 Mon Sep 17 00:00:00 2001
    >>> From: Trond Myklebust<Trond.Myklebust@netapp.com>
    >>> Date: Tue, 7 Feb 2012 00:05:11 -0500
    >>> Subject: [PATCH] NFS: Initialise the nfs_net->nfs_client_lock
    >>>
    >>> Ensure that we initialise the nfs_net->nfs_client_lock spinlock.
    >>> Also ensure that nfs_server_remove_lists() doesn't try to
    >>> dereference server->nfs_client before that is initialised.
    >>>
    >>
    >> Sorry.
    >> Patch looks nice. Except one notice below.
    >>
    >>> Signed-off-by: Trond Myklebust<Trond.Myklebust@netapp.com>
    >>> Cc: Stanislav Kinsbursky<skinsbursky@parallels.com>
    >>> ---
    >>> fs/nfs/client.c | 6 +++++-
    >>> 1 files changed, 5 insertions(+), 1 deletions(-)
    >>>
    >>> diff --git a/fs/nfs/client.c b/fs/nfs/client.c
    >>> index 1a5cd49..f0dacad 100644
    >>> --- a/fs/nfs/client.c
    >>> +++ b/fs/nfs/client.c
    >>> @@ -1055,8 +1055,11 @@ static void nfs_server_insert_lists(struct nfs_server *server)
    >>> static void nfs_server_remove_lists(struct nfs_server *server)
    >>> {
    >>> struct nfs_client *clp = server->nfs_client;
    >>> - struct nfs_net *nn = net_generic(clp->net, nfs_net_id);
    >>> + struct nfs_net *nn;
    >>>
    >>> + if (clp == NULL)
    >>> + return;
    >>> + nn = net_generic(clp->net, nfs_net_id);
    >>> spin_lock(&nn->nfs_client_lock);
    >>> list_del_rcu(&server->client_link);
    >>> if (clp&& list_empty(&clp->cl_superblocks))
    >>
    >> This check for clp != NULL can be removed.
    >>
    >
    > Yep... I'll add that in...



    When I compile Trond's devel branch I get this:

    make[1]: Nothing to be done for `all'.
    CHK include/linux/version.h
    CHK include/generated/utsrelease.h
    CALL scripts/checksyscalls.sh
    CHK include/generated/compile.h
    CHK kernel/config_data.h
    CC [M] fs/nfs/idmap.o
    fs/nfs/idmap.c: In function 'rpc_pipefs_event':
    fs/nfs/idmap.c:535:9: error: implicit declaration of function 'net_generic' [-Werror=implicit-function-declaration]
    fs/nfs/idmap.c:535:50: error: 'nfs_net_id' undeclared (first use in this function)
    fs/nfs/idmap.c:535:50: note: each undeclared identifier is reported only once for each function it appears in
    fs/nfs/idmap.c:540:82: error: dereferencing pointer to incomplete type
    fs/nfs/idmap.c:540:224: error: dereferencing pointer to incomplete type
    cc1: some warnings being treated as errors

    make[2]: *** [fs/nfs/idmap.o] Error 1
    make[1]: *** [fs/nfs] Error 2
    make: *** [fs] Error 2

    I bisected it to this patch, probably a missing #include?

    - Bryan

    >


    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-02-07 15:33    [W:0.028 / U:59.300 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site