Commit 7d751f6f authored Jun 03, 2011 by Casey Bodley Committed by J. Bruce Fields Jun 06, 2011

nfsd: link returns nfserr_delay when breaking lease



fix for commit 4795bb37, 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>

parent be1f4084

fs/nfsd/vfs.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1660,8 +1660,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));

Admin message