From 24e8802a4ac43b2e7fcc11fc31d2b7bec5f83a3f Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@citi.umich.edu>
Date: Fri, 3 Jun 2011 12:21:23 -0400
Subject: [PATCH] --- yaml --- r: 253893 b: refs/heads/master c:
 7d751f6f8c679f51b73d01a1b5269347a929004c h: refs/heads/master i:   253891:
 4742bf746a8deaa59270fc6e847a0c4b92913c60 v: v3

---
 [refs]              | 2 +-
 trunk/fs/nfsd/vfs.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 436fa5880f28..8bd86830b1be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be1f4084b4824301e640e81d63b6275cd99ee6a1
+refs/heads/master: 7d751f6f8c679f51b73d01a1b5269347a929004c
diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c
index d5718273bb32..f3fb61b69a1e 100644
--- a/trunk/fs/nfsd/vfs.c
+++ b/trunk/fs/nfsd/vfs.c
@@ -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));