diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /fs/nfsd/vfs.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index ff93025ae2f7..2e1cebde90df 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
| @@ -1749,8 +1749,6 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, | |||
| 1749 | if (host_err) | 1749 | if (host_err) |
| 1750 | goto out_drop_write; | 1750 | goto out_drop_write; |
| 1751 | } | 1751 | } |
| 1752 | if (host_err) | ||
| 1753 | goto out_drop_write; | ||
| 1754 | host_err = vfs_rename(fdir, odentry, tdir, ndentry); | 1752 | host_err = vfs_rename(fdir, odentry, tdir, ndentry); |
| 1755 | if (!host_err) { | 1753 | if (!host_err) { |
| 1756 | host_err = commit_metadata(tfhp); | 1754 | host_err = commit_metadata(tfhp); |