Skip to content

Commit 3f3503a

Browse files
committed
NFSD: Use vfs_iocb_iter_write()
Refactor: Enable the use of IOCB flags to control NFSD's individual write operations. This allows the eventual use of atomic, uncached, direct, or asynchronous writes. Suggested-by: NeilBrown <neil@brown.name> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: NeilBrown <neil@brown.name> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 37fe6f1 commit 3f3503a

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

fs/nfsd/vfs.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,15 +1173,14 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp,
11731173
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
11741174
struct file *file = nf->nf_file;
11751175
struct super_block *sb = file_inode(file)->i_sb;
1176+
struct kiocb kiocb;
11761177
struct svc_export *exp;
11771178
struct iov_iter iter;
11781179
errseq_t since;
11791180
__be32 nfserr;
11801181
int host_err;
1181-
loff_t pos = offset;
11821182
unsigned long exp_op_flags = 0;
11831183
unsigned int pflags = current->flags;
1184-
rwf_t flags = 0;
11851184
bool restore_flags = false;
11861185
unsigned int nvecs;
11871186

@@ -1207,16 +1206,17 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp,
12071206

12081207
if (!EX_ISSYNC(exp))
12091208
stable = NFS_UNSTABLE;
1210-
1209+
init_sync_kiocb(&kiocb, file);
1210+
kiocb.ki_pos = offset;
12111211
if (stable && !fhp->fh_use_wgather)
1212-
flags |= RWF_SYNC;
1212+
kiocb.ki_flags |= IOCB_DSYNC;
12131213

12141214
nvecs = xdr_buf_to_bvec(rqstp->rq_bvec, rqstp->rq_maxpages, payload);
12151215
iov_iter_bvec(&iter, ITER_SOURCE, rqstp->rq_bvec, nvecs, *cnt);
12161216
since = READ_ONCE(file->f_wb_err);
12171217
if (verf)
12181218
nfsd_copy_write_verifier(verf, nn);
1219-
host_err = vfs_iter_write(file, &iter, &pos, flags);
1219+
host_err = vfs_iocb_iter_write(file, &kiocb, &iter);
12201220
if (host_err < 0) {
12211221
commit_reset_write_verifier(nn, rqstp, host_err);
12221222
goto out_nfserr;

0 commit comments

Comments
 (0)