|
@@ -1276,6 +1276,10 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
|
* If it has, the parent directory should already be locked.
|
|
|
*/
|
|
|
if (!resfhp->fh_dentry) {
|
|
|
+ host_err = fh_want_write(fhp);
|
|
|
+ if (host_err)
|
|
|
+ goto out_nfserr;
|
|
|
+
|
|
|
/* called from nfsd_proc_mkdir, or possibly nfsd3_proc_create */
|
|
|
fh_lock_nested(fhp, I_MUTEX_PARENT);
|
|
|
dchild = lookup_one_len(fname, dentry, flen);
|
|
@@ -1319,14 +1323,11 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
- host_err = fh_want_write(fhp);
|
|
|
- if (host_err)
|
|
|
- goto out_nfserr;
|
|
|
-
|
|
|
/*
|
|
|
* Get the dir op function pointer.
|
|
|
*/
|
|
|
err = 0;
|
|
|
+ host_err = 0;
|
|
|
switch (type) {
|
|
|
case S_IFREG:
|
|
|
host_err = vfs_create(dirp, dchild, iap->ia_mode, true);
|
|
@@ -1343,10 +1344,8 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
|
host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev);
|
|
|
break;
|
|
|
}
|
|
|
- if (host_err < 0) {
|
|
|
- fh_drop_write(fhp);
|
|
|
+ if (host_err < 0)
|
|
|
goto out_nfserr;
|
|
|
- }
|
|
|
|
|
|
err = nfsd_create_setattr(rqstp, resfhp, iap);
|
|
|
|
|
@@ -1358,7 +1357,6 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
|
err2 = nfserrno(commit_metadata(fhp));
|
|
|
if (err2)
|
|
|
err = err2;
|
|
|
- fh_drop_write(fhp);
|
|
|
/*
|
|
|
* Update the file handle to get the new inode info.
|
|
|
*/
|
|
@@ -1417,6 +1415,11 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
|
err = nfserr_notdir;
|
|
|
if (!dirp->i_op->lookup)
|
|
|
goto out;
|
|
|
+
|
|
|
+ host_err = fh_want_write(fhp);
|
|
|
+ if (host_err)
|
|
|
+ goto out_nfserr;
|
|
|
+
|
|
|
fh_lock_nested(fhp, I_MUTEX_PARENT);
|
|
|
|
|
|
/*
|
|
@@ -1449,9 +1452,6 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
|
v_atime = verifier[1]&0x7fffffff;
|
|
|
}
|
|
|
|
|
|
- host_err = fh_want_write(fhp);
|
|
|
- if (host_err)
|
|
|
- goto out_nfserr;
|
|
|
if (dchild->d_inode) {
|
|
|
err = 0;
|
|
|
|
|
@@ -1522,7 +1522,6 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
|
if (!err)
|
|
|
err = nfserrno(commit_metadata(fhp));
|
|
|
|
|
|
- fh_drop_write(fhp);
|
|
|
/*
|
|
|
* Update the filehandle to get the new inode info.
|
|
|
*/
|
|
@@ -1533,6 +1532,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
|
fh_unlock(fhp);
|
|
|
if (dchild && !IS_ERR(dchild))
|
|
|
dput(dchild);
|
|
|
+ fh_drop_write(fhp);
|
|
|
return err;
|
|
|
|
|
|
out_nfserr:
|
|
@@ -1613,6 +1613,11 @@ nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
|
err = fh_verify(rqstp, fhp, S_IFDIR, NFSD_MAY_CREATE);
|
|
|
if (err)
|
|
|
goto out;
|
|
|
+
|
|
|
+ host_err = fh_want_write(fhp);
|
|
|
+ if (host_err)
|
|
|
+ goto out_nfserr;
|
|
|
+
|
|
|
fh_lock(fhp);
|
|
|
dentry = fhp->fh_dentry;
|
|
|
dnew = lookup_one_len(fname, dentry, flen);
|
|
@@ -1620,10 +1625,6 @@ nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
|
if (IS_ERR(dnew))
|
|
|
goto out_nfserr;
|
|
|
|
|
|
- host_err = fh_want_write(fhp);
|
|
|
- if (host_err)
|
|
|
- goto out_nfserr;
|
|
|
-
|
|
|
if (unlikely(path[plen] != 0)) {
|
|
|
char *path_alloced = kmalloc(plen+1, GFP_KERNEL);
|
|
|
if (path_alloced == NULL)
|
|
@@ -1683,6 +1684,12 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
|
|
|
if (isdotent(name, len))
|
|
|
goto out;
|
|
|
|
|
|
+ host_err = fh_want_write(tfhp);
|
|
|
+ if (host_err) {
|
|
|
+ err = nfserrno(host_err);
|
|
|
+ goto out;
|
|
|
+ }
|
|
|
+
|
|
|
fh_lock_nested(ffhp, I_MUTEX_PARENT);
|
|
|
ddir = ffhp->fh_dentry;
|
|
|
dirp = ddir->d_inode;
|
|
@@ -1694,18 +1701,13 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
|
|
|
|
|
|
dold = tfhp->fh_dentry;
|
|
|
|
|
|
- host_err = fh_want_write(tfhp);
|
|
|
- if (host_err) {
|
|
|
- err = nfserrno(host_err);
|
|
|
- goto out_dput;
|
|
|
- }
|
|
|
err = nfserr_noent;
|
|
|
if (!dold->d_inode)
|
|
|
- goto out_drop_write;
|
|
|
+ goto out_dput;
|
|
|
host_err = nfsd_break_lease(dold->d_inode);
|
|
|
if (host_err) {
|
|
|
err = nfserrno(host_err);
|
|
|
- goto out_drop_write;
|
|
|
+ goto out_dput;
|
|
|
}
|
|
|
host_err = vfs_link(dold, dirp, dnew);
|
|
|
if (!host_err) {
|
|
@@ -1718,12 +1720,11 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
|
|
|
else
|
|
|
err = nfserrno(host_err);
|
|
|
}
|
|
|
-out_drop_write:
|
|
|
- fh_drop_write(tfhp);
|
|
|
out_dput:
|
|
|
dput(dnew);
|
|
|
out_unlock:
|
|
|
fh_unlock(ffhp);
|
|
|
+ fh_drop_write(tfhp);
|
|
|
out:
|
|
|
return err;
|
|
|
|
|
@@ -1766,6 +1767,12 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,
|
|
|
if (!flen || isdotent(fname, flen) || !tlen || isdotent(tname, tlen))
|
|
|
goto out;
|
|
|
|
|
|
+ host_err = fh_want_write(ffhp);
|
|
|
+ if (host_err) {
|
|
|
+ err = nfserrno(host_err);
|
|
|
+ goto out;
|
|
|
+ }
|
|
|
+
|
|
|
/* cannot use fh_lock as we need deadlock protective ordering
|
|
|
* so do it by hand */
|
|
|
trap = lock_rename(tdentry, fdentry);
|
|
@@ -1796,17 +1803,14 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,
|
|
|
host_err = -EXDEV;
|
|
|
if (ffhp->fh_export->ex_path.mnt != tfhp->fh_export->ex_path.mnt)
|
|
|
goto out_dput_new;
|
|
|
- host_err = fh_want_write(ffhp);
|
|
|
- if (host_err)
|
|
|
- goto out_dput_new;
|
|
|
|
|
|
host_err = nfsd_break_lease(odentry->d_inode);
|
|
|
if (host_err)
|
|
|
- goto out_drop_write;
|
|
|
+ goto out_dput_new;
|
|
|
if (ndentry->d_inode) {
|
|
|
host_err = nfsd_break_lease(ndentry->d_inode);
|
|
|
if (host_err)
|
|
|
- goto out_drop_write;
|
|
|
+ goto out_dput_new;
|
|
|
}
|
|
|
host_err = vfs_rename(fdir, odentry, tdir, ndentry);
|
|
|
if (!host_err) {
|
|
@@ -1814,8 +1818,6 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,
|
|
|
if (!host_err)
|
|
|
host_err = commit_metadata(ffhp);
|
|
|
}
|
|
|
-out_drop_write:
|
|
|
- fh_drop_write(ffhp);
|
|
|
out_dput_new:
|
|
|
dput(ndentry);
|
|
|
out_dput_old:
|
|
@@ -1831,6 +1833,7 @@ out_drop_write:
|
|
|
fill_post_wcc(tfhp);
|
|
|
unlock_rename(tdentry, fdentry);
|
|
|
ffhp->fh_locked = tfhp->fh_locked = 0;
|
|
|
+ fh_drop_write(ffhp);
|
|
|
|
|
|
out:
|
|
|
return err;
|
|
@@ -1856,6 +1859,10 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
|
|
|
if (err)
|
|
|
goto out;
|
|
|
|
|
|
+ host_err = fh_want_write(fhp);
|
|
|
+ if (host_err)
|
|
|
+ goto out_nfserr;
|
|
|
+
|
|
|
fh_lock_nested(fhp, I_MUTEX_PARENT);
|
|
|
dentry = fhp->fh_dentry;
|
|
|
dirp = dentry->d_inode;
|
|
@@ -1874,21 +1881,15 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
|
|
|
if (!type)
|
|
|
type = rdentry->d_inode->i_mode & S_IFMT;
|
|
|
|
|
|
- host_err = fh_want_write(fhp);
|
|
|
- if (host_err)
|
|
|
- goto out_put;
|
|
|
-
|
|
|
host_err = nfsd_break_lease(rdentry->d_inode);
|
|
|
if (host_err)
|
|
|
- goto out_drop_write;
|
|
|
+ goto out_put;
|
|
|
if (type != S_IFDIR)
|
|
|
host_err = vfs_unlink(dirp, rdentry);
|
|
|
else
|
|
|
host_err = vfs_rmdir(dirp, rdentry);
|
|
|
if (!host_err)
|
|
|
host_err = commit_metadata(fhp);
|
|
|
-out_drop_write:
|
|
|
- fh_drop_write(fhp);
|
|
|
out_put:
|
|
|
dput(rdentry);
|
|
|
|