|
@@ -1134,7 +1134,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
"nfsd_create: parent %s/%s not locked!\n",
|
|
"nfsd_create: parent %s/%s not locked!\n",
|
|
dentry->d_parent->d_name.name,
|
|
dentry->d_parent->d_name.name,
|
|
dentry->d_name.name);
|
|
dentry->d_name.name);
|
|
- err = -EIO;
|
|
|
|
|
|
+ err = nfserr_io;
|
|
goto out;
|
|
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) &&
|
|
if ((ffhp->fh_export->ex_flags & NFSEXP_MSNFS) &&
|
|
((atomic_read(&odentry->d_count) > 1)
|
|
((atomic_read(&odentry->d_count) > 1)
|
|
|| (atomic_read(&ndentry->d_count) > 1))) {
|
|
|| (atomic_read(&ndentry->d_count) > 1))) {
|
|
- err = nfserr_perm;
|
|
|
|
|
|
+ err = -EPERM;
|
|
} else
|
|
} else
|
|
#endif
|
|
#endif
|
|
err = vfs_rename(fdir, odentry, tdir, ndentry);
|
|
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
|
|
#ifdef MSNFS
|
|
if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) &&
|
|
if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) &&
|
|
(atomic_read(&rdentry->d_count) > 1)) {
|
|
(atomic_read(&rdentry->d_count) > 1)) {
|
|
- err = nfserr_perm;
|
|
|
|
|
|
+ err = -EPERM;
|
|
} else
|
|
} else
|
|
#endif
|
|
#endif
|
|
err = vfs_unlink(dirp, rdentry);
|
|
err = vfs_unlink(dirp, rdentry);
|