Merge tag 'nfsd-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

[linux-2.6-block.git] / fs / nfsd / vfs.c

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 6a9464262fae6bea461c4764ce98c53ca20f9754..2e41eb4c3cec76f00227f5f689bda39430a90b04 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1852,7 +1852,7 @@ retry:
        trap = lock_rename(tdentry, fdentry);
        if (IS_ERR(trap)) {
                err = (rqstp->rq_vers == 2) ? nfserr_acces : nfserr_xdev;
-               goto out;
+               goto out_want_write;
        }
        err = fh_fill_pre_attrs(ffhp);
        if (err != nfs_ok)
@@ -1922,6 +1922,7 @@ retry:
        }
 out_unlock:
        unlock_rename(tdentry, fdentry);
+out_want_write:
        fh_drop_write(ffhp);
 
        /*