---

yaml --- r: 233278 b: refs/heads/master c: 83f6b0c h: refs/heads/master v: v3
git-mirror · Feb 14, 2011 · e43132e · e43132e
1 parent a1fbf5b
commit e43132e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acfdf5c383b38f7f4dddae41b97c97f1ae058f49
+refs/heads/master: 83f6b0c18204f68961f58b9f69e5dba0d36056a2
diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c
@@ -1742,6 +1742,13 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,
 		goto out_dput_new;
 
 	host_err = nfsd_break_lease(odentry->d_inode);
+	if (host_err)
+		goto out_drop_write;
+	if (ndentry->d_inode) {
+		host_err = nfsd_break_lease(ndentry->d_inode);
+		if (host_err)
+			goto out_drop_write;
+	}
 	if (host_err)
 		goto out_drop_write;
 	host_err = vfs_rename(fdir, odentry, tdir, ndentry);