diff options
| author | Inki Dae <inki.dae@samsung.com> | 2012-05-08 18:02:50 +0900 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2012-05-08 18:02:50 +0900 |
| commit | 922f6e99368a6e513a6433bb9a21be274c029c51 (patch) | |
| tree | 33c02b5e18e79756005a3edfa7c862a47de668d5 /fs/nfsd/vfs.c | |
| parent | 5db578e167cfeedbd086df45cc2328b5bb9cf3fd (diff) | |
| parent | 4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd (diff) | |
| download | op-kernel-dev-922f6e99368a6e513a6433bb9a21be274c029c51.zip op-kernel-dev-922f6e99368a6e513a6433bb9a21be274c029c51.tar.gz | |
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-next
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 296d671..5686661 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1458,7 +1458,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, switch (createmode) { case NFS3_CREATE_UNCHECKED: if (! S_ISREG(dchild->d_inode->i_mode)) - err = nfserr_exist; + goto out; else if (truncp) { /* in nfsv4, we need to treat this case a little * differently. we don't want to truncate the |
