nfsd: hook up nfsd_write to the new nfsd_file cache

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>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 5983206ab0366e33db6fcd79d7cac5378e2d235d..2f5b52004a180164f466798db2d5ed669dd75e1c 100644 (file)
--- 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;