io_uring: add support for IORING_OP_LINKAT

[linux-2.6-microblaze.git] / fs / nfsd / vfs.c

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 15adf1f..a224a5e 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1123,6 +1123,19 @@ out:
 }
 
 #ifdef CONFIG_NFSD_V3
+static int
+nfsd_filemap_write_and_wait_range(struct nfsd_file *nf, loff_t offset,
+                                 loff_t end)
+{
+       struct address_space *mapping = nf->nf_file->f_mapping;
+       int ret = filemap_fdatawrite_range(mapping, offset, end);
+
+       if (ret)
+               return ret;
+       filemap_fdatawait_range_keep_errors(mapping, offset, end);
+       return 0;
+}
+
 /*
  * Commit all pending writes to stable storage.
  *
@@ -1153,10 +1166,11 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp,
        if (err)
                goto out;
        if (EX_ISSYNC(fhp->fh_export)) {
-               int err2;
+               int err2 = nfsd_filemap_write_and_wait_range(nf, offset, end);
 
                down_write(&nf->nf_rwsem);
-               err2 = vfs_fsync_range(nf->nf_file, offset, end, 0);
+               if (!err2)
+                       err2 = vfs_fsync_range(nf->nf_file, offset, end, 0);
                switch (err2) {
                case 0:
                        nfsd_copy_boot_verifier(verf, net_generic(nf->nf_net,
@@ -1613,9 +1627,9 @@ nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp,
 
        host_err = vfs_symlink(&init_user_ns, d_inode(dentry), dnew, path);
        err = nfserrno(host_err);
+       fh_unlock(fhp);
        if (!err)
                err = nfserrno(commit_metadata(fhp));
-       fh_unlock(fhp);
 
        fh_drop_write(fhp);
 
@@ -1680,6 +1694,7 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
        if (d_really_is_negative(dold))
                goto out_dput;
        host_err = vfs_link(dold, &init_user_ns, dirp, dnew, NULL);
+       fh_unlock(ffhp);
        if (!host_err) {
                err = nfserrno(commit_metadata(ffhp));
                if (!err)
@@ -1859,6 +1874,7 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
 {
        struct dentry   *dentry, *rdentry;
        struct inode    *dirp;
+       struct inode    *rinode;
        __be32          err;
        int             host_err;
 
@@ -1887,6 +1903,8 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
                host_err = -ENOENT;
                goto out_drop_write;
        }
+       rinode = d_inode(rdentry);
+       ihold(rinode);
 
        if (!type)
                type = d_inode(rdentry)->i_mode & S_IFMT;
@@ -1899,9 +1917,11 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
                host_err = vfs_rmdir(&init_user_ns, dirp, rdentry);
        }
 
+       fh_unlock(fhp);
        if (!host_err)
                host_err = commit_metadata(fhp);
        dput(rdentry);
+       iput(rinode);    /* truncate the inode here */
 
 out_drop_write:
        fh_drop_write(fhp);