Attachment 585472 Details for Bug 823018 – nfsd: link returns nfserr_delay when breaking lease

[patch] nfsd: link returns nfserr_delay when breaking lease

TMP (text/plain), 1.22 KB, created by J. Bruce Fields on 2012-05-18 19:28:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: J. Bruce Fields

Created: 2012-05-18 19:28:39 UTC

Size: 1.22 KB

patch

obsolete

>commit c1058e06c8c27c64d8c4ade15b43fff16f2c3cb1
>Author: Casey Bodley <cbodley@citi.umich.edu>
>Date:   Fri Jun 3 12:21:23 2011 -0400
>
>    nfsd: link returns nfserr_delay when breaking lease
>    
>    fix for commit 4795bb37effb7b8fe77e2d2034545d062d3788a8, nfsd: break
>    lease on unlink, link, and rename
>    
>    if the LINK operation breaks a delegation, it returns NFS4ERR_NOENT
>    (which is not a valid error in rfc 5661) instead of NFS4ERR_DELAY.
>    the return value of nfsd_break_lease() in nfsd_link() must be
>    converted from host_err to err
>    
>    Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
>    Cc: stable@kernel.org
>    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
>    
>    Upstream 7d751f6f8c679f51b73d01a1b5269347a929004c
>    Bugzilla 823018
>
>diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
>index 0c798fa..2dae55b 100644
>--- a/fs/nfsd/vfs.c
>+++ b/fs/nfsd/vfs.c
>@@ -1693,8 +1693,10 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
> 	if (!dold->d_inode)
> 		goto out_drop_write;
> 	host_err = nfsd_break_lease(dold->d_inode);
>-	if (host_err)
>+	if (host_err) {
>+		err = nfserrno(host_err);
> 		goto out_drop_write;
>+	}
> 	host_err = vfs_link(dold, dirp, dnew);
> 	if (!host_err) {
> 		err = nfserrno(commit_metadata(ffhp));

Actions: View | Diff

Attachments on bug 823018: 585472