Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d75f2b9f authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] nfsd/vfs.c: endianness fixes 



Several failure exits return -E<something> instead of nfserr_<something> and
vice versa.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 52748819

fs/nfsd/vfs.c

+3 −3
Original line number Diff line number Diff line
@@ -1134,7 +1134,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, 
				"nfsd_create: parent %s/%s not locked!\n",

				dentry->d_parent->d_name.name,

				dentry->d_name.name);

			err = -EIO;

			err = nfserr_io;

			goto out;

		}

	}
@@ -1600,7 +1600,7 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, 
	if ((ffhp->fh_export->ex_flags & NFSEXP_MSNFS) &&

		((atomic_read(&odentry->d_count) > 1)

		 || (atomic_read(&ndentry->d_count) > 1))) {

			err = nfserr_perm;

			err = -EPERM;

	} else

#endif

	err = vfs_rename(fdir, odentry, tdir, ndentry);
@@ -1672,7 +1672,7 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, 
#ifdef MSNFS

		if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) &&

			(atomic_read(&rdentry->d_count) > 1)) {

			err = nfserr_perm;

			err = -EPERM;

		} else

#endif

		err = vfs_unlink(dirp, rdentry);