From: Trond Myklebust <trondmy@gmail.com>
To: "J. Bruce Fields" <bfields@redhat.com>
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH v2 06/16] nfsd: hook up nfsd_write to the new nfsd_file cache
Date: Sun, 18 Aug 2019 14:18:49 -0400 [thread overview]
Message-ID: <20190818181859.8458-7-trond.myklebust@hammerspace.com> (raw)
In-Reply-To: <20190818181859.8458-6-trond.myklebust@hammerspace.com>
From: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
fs/nfsd/vfs.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 5983206ab036..2f5b52004a18 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -44,6 +44,7 @@
#include "nfsd.h"
#include "vfs.h"
+#include "filecache.h"
#include "trace.h"
#define NFSDDBG_FACILITY NFSDDBG_FILEOP
@@ -1104,17 +1105,18 @@ __be32
nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset,
struct kvec *vec, int vlen, unsigned long *cnt, int stable)
{
- struct file *file = NULL;
- __be32 err = 0;
+ struct nfsd_file *nf;
+ __be32 err;
trace_nfsd_write_start(rqstp, fhp, offset, *cnt);
- err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_WRITE, &file);
+ err = nfsd_file_acquire(rqstp, fhp, NFSD_MAY_WRITE, &nf);
if (err)
goto out;
- err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, cnt, stable);
- fput(file);
+ err = nfsd_vfs_write(rqstp, fhp, nf->nf_file, offset, vec,
+ vlen, cnt, stable);
+ nfsd_file_put(nf);
out:
trace_nfsd_write_done(rqstp, fhp, offset, *cnt);
return err;
--
2.21.0
next prev parent reply other threads:[~2019-08-18 18:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-18 18:18 [PATCH v2 00/16] Cache open file descriptors in knfsd Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 01/16] sunrpc: add a new cache_detail operation for when a cache is flushed Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 02/16] locks: create a new notifier chain for lease attempts Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 03/16] notify: export symbols for use by the knfsd file cache Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 04/16] vfs: Export flush_delayed_fput for use by knfsd Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 05/16] nfsd: add a new struct file caching facility to nfsd Trond Myklebust
2019-08-18 18:18 ` Trond Myklebust [this message]
2019-08-18 18:18 ` [PATCH v2 07/16] nfsd: hook up nfsd_read to the nfsd_file cache Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 08/16] nfsd: hook nfsd_commit up " Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 09/16] nfsd: convert nfs4_file->fi_fds array to use nfsd_files Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 10/16] nfsd: convert fi_deleg_file and ls_file fields to nfsd_file Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 11/16] nfsd: hook up nfs4_preprocess_stateid_op to the nfsd_file cache Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 12/16] nfsd: have nfsd_test_lock use " Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 13/16] nfsd: rip out the raparms cache Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 14/16] nfsd: close cached files prior to a REMOVE or RENAME that would replace target Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 15/16] nfsd: Fix up some unused variable warnings Trond Myklebust
2019-08-18 18:18 ` [PATCH v2 16/16] nfsd: Fix the documentation for svcxdr_tmpalloc() Trond Myklebust
2019-08-19 15:01 ` [PATCH v2 00/16] Cache open file descriptors in knfsd J. Bruce Fields
2019-08-19 15:11 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190818181859.8458-7-trond.myklebust@hammerspace.com \
--to=trondmy@gmail.com \
--cc=bfields@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).