diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-01-18 20:43:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 22:20:27 -0500 |
commit | d75f2b9f5da71667aba7e97a962c49f1e17aa4ca (patch) | |
tree | 41f72cd81aa07f0476fc240c391cbc66cc5d02fd | |
parent | 5274881992b8a632620f69346401da66e480a23b (diff) |
[PATCH] nfsd/vfs.c: endianness fixes
Several failure exits return -E<something> instead of nfserr_<something> and
vice versa.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/nfsd/vfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 6acec3416763..e6dfa149a300 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -1134,7 +1134,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
1134 | "nfsd_create: parent %s/%s not locked!\n", | 1134 | "nfsd_create: parent %s/%s not locked!\n", |
1135 | dentry->d_parent->d_name.name, | 1135 | dentry->d_parent->d_name.name, |
1136 | dentry->d_name.name); | 1136 | dentry->d_name.name); |
1137 | err = -EIO; | 1137 | err = nfserr_io; |
1138 | goto out; | 1138 | goto out; |
1139 | } | 1139 | } |
1140 | } | 1140 | } |
@@ -1600,7 +1600,7 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, | |||
1600 | if ((ffhp->fh_export->ex_flags & NFSEXP_MSNFS) && | 1600 | if ((ffhp->fh_export->ex_flags & NFSEXP_MSNFS) && |
1601 | ((atomic_read(&odentry->d_count) > 1) | 1601 | ((atomic_read(&odentry->d_count) > 1) |
1602 | || (atomic_read(&ndentry->d_count) > 1))) { | 1602 | || (atomic_read(&ndentry->d_count) > 1))) { |
1603 | err = nfserr_perm; | 1603 | err = -EPERM; |
1604 | } else | 1604 | } else |
1605 | #endif | 1605 | #endif |
1606 | err = vfs_rename(fdir, odentry, tdir, ndentry); | 1606 | err = vfs_rename(fdir, odentry, tdir, ndentry); |
@@ -1672,7 +1672,7 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | |||
1672 | #ifdef MSNFS | 1672 | #ifdef MSNFS |
1673 | if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) && | 1673 | if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) && |
1674 | (atomic_read(&rdentry->d_count) > 1)) { | 1674 | (atomic_read(&rdentry->d_count) > 1)) { |
1675 | err = nfserr_perm; | 1675 | err = -EPERM; |
1676 | } else | 1676 | } else |
1677 | #endif | 1677 | #endif |
1678 | err = vfs_unlink(dirp, rdentry); | 1678 | err = vfs_unlink(dirp, rdentry); |