diff options
| -rw-r--r-- | fs/nfsd/vfs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 641117f2188d..fda3be237773 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
| @@ -1812,22 +1812,22 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | |||
| 1812 | 1812 | ||
| 1813 | host_err = mnt_want_write(fhp->fh_export->ex_path.mnt); | 1813 | host_err = mnt_want_write(fhp->fh_export->ex_path.mnt); |
| 1814 | if (host_err) | 1814 | if (host_err) |
| 1815 | goto out_nfserr; | 1815 | goto out_put; |
| 1816 | 1816 | ||
| 1817 | host_err = nfsd_break_lease(rdentry->d_inode); | 1817 | host_err = nfsd_break_lease(rdentry->d_inode); |
| 1818 | if (host_err) | 1818 | if (host_err) |
| 1819 | goto out_put; | 1819 | goto out_drop_write; |
| 1820 | if (type != S_IFDIR) | 1820 | if (type != S_IFDIR) |
| 1821 | host_err = vfs_unlink(dirp, rdentry); | 1821 | host_err = vfs_unlink(dirp, rdentry); |
| 1822 | else | 1822 | else |
| 1823 | host_err = vfs_rmdir(dirp, rdentry); | 1823 | host_err = vfs_rmdir(dirp, rdentry); |
| 1824 | out_put: | ||
| 1825 | dput(rdentry); | ||
| 1826 | |||
| 1827 | if (!host_err) | 1824 | if (!host_err) |
| 1828 | host_err = commit_metadata(fhp); | 1825 | host_err = commit_metadata(fhp); |
| 1829 | 1826 | out_drop_write: | |
| 1830 | mnt_drop_write(fhp->fh_export->ex_path.mnt); | 1827 | mnt_drop_write(fhp->fh_export->ex_path.mnt); |
| 1828 | out_put: | ||
| 1829 | dput(rdentry); | ||
| 1830 | |||
| 1831 | out_nfserr: | 1831 | out_nfserr: |
| 1832 | err = nfserrno(host_err); | 1832 | err = nfserrno(host_err); |
| 1833 | out: | 1833 | out: |
