• Christoph Hellwig's avatar
    Subject: nfsd: don't recursively call nfsd4_cb_layout_fail · 133d5582
    Christoph Hellwig authored
    Due to a merge error when creating c5c707f9 ("nfsd: implement pNFS
    layout recalls"), we recursively call nfsd4_cb_layout_fail from itself,
    leading to stack overflows.
    Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
    Fixes:  c5c707f9 ("nfsd: implement pNFS layout recalls")
    Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
    ---
     fs/nfsd/nfs4layouts.c | 2 --
     1 file changed, 2 deletions(-)
    
    diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
    index 3c1bfa1..1028a06 100644
    --- a/fs/nfsd/nfs4layouts.c
    +++ b/fs/nfsd/nfs4layouts.c
    @@ -587,8 +587,6 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls)
    
     	rpc_ntop((struct sockaddr *)&clp->cl_addr, addr_str, sizeof(addr_str));
    
    -	nfsd4_cb_layout_fail(ls);
    -
     	printk(KERN_WARNING
     		"nfsd: client %s failed to respond to layout recall. "
     		"  Fencing..\n", addr_str);
    --
    1.9.1
    133d5582
nfs4layouts.c 16.8 KB