nfsd: take struct file setup fully into nfs4_preprocess_stateid_op

This patch changes nfs4_preprocess_stateid_op so it always returns
a valid struct file if it has been asked for that.  For that we
now allocate a temporary struct file for special stateids, and check
permissions if we got the file structure from the stateid.  This
ensures that all callers will get their handling of special stateids
right, and avoids code duplication.

There is a little wart in here because the read code needs to know
if we allocated a file structure so that it can copy around the
read-ahead parameters.  In the long run we should probably aim to
cache full file structures used with special stateids instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 864e2003e8ded5c8e6ff5db13f7fd9331ebefb65..5aa7c4e7fc8cd353b45957955c850be780da636a 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -760,8 +760,6 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 {
        __be32 status;
 
-       /* no need to check permission - this will be done in nfsd_read() */
-
        read->rd_filp = NULL;
        if (read->rd_offset >= OFFSET_MAX)
                return nfserr_inval;
@@ -778,9 +776,9 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                clear_bit(RQ_SPLICE_OK, &rqstp->rq_flags);
 
        /* check stateid */
-       if ((status = nfs4_preprocess_stateid_op(SVC_NET(rqstp),
-                                                cstate, &read->rd_stateid,
-                                                RD_STATE, &read->rd_filp))) {
+       status = nfs4_preprocess_stateid_op(rqstp, cstate, &read->rd_stateid,
+                       RD_STATE, &read->rd_filp, &read->rd_tmp_file);
+       if (status) {
                dprintk("NFSD: nfsd4_read: couldn't process stateid!\n");
                goto out;
        }
@@ -924,8 +922,8 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        int err;
 
        if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
-               status = nfs4_preprocess_stateid_op(SVC_NET(rqstp), cstate,
-                       &setattr->sa_stateid, WR_STATE, NULL);
+               status = nfs4_preprocess_stateid_op(rqstp, cstate,
+                       &setattr->sa_stateid, WR_STATE, NULL, NULL);
                if (status) {
                        dprintk("NFSD: nfsd4_setattr: couldn't process stateid!\n");
                        return status;
@@ -986,13 +984,11 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        unsigned long cnt;
        int nvecs;
 
-       /* no need to check permission - this will be done in nfsd_write() */
-
        if (write->wr_offset >= OFFSET_MAX)
                return nfserr_inval;
 
-       status = nfs4_preprocess_stateid_op(SVC_NET(rqstp),
-                                       cstate, stateid, WR_STATE, &filp);
+       status = nfs4_preprocess_stateid_op(rqstp, cstate, stateid, WR_STATE,
+                       &filp, NULL);
        if (status) {
                dprintk("NFSD: nfsd4_write: couldn't process stateid!\n");
                return status;
@@ -1005,11 +1001,10 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        nvecs = fill_in_write_vector(rqstp->rq_vec, write);
        WARN_ON_ONCE(nvecs > ARRAY_SIZE(rqstp->rq_vec));
 
-       status =  nfsd_write(rqstp, &cstate->current_fh, filp,
-                            write->wr_offset, rqstp->rq_vec, nvecs,
-                            &cnt, &write->wr_how_written);
-       if (filp)
-               fput(filp);
+       status = nfsd_vfs_write(rqstp, &cstate->current_fh, filp,
+                               write->wr_offset, rqstp->rq_vec, nvecs, &cnt,
+                               &write->wr_how_written);
+       fput(filp);
 
        write->wr_bytes_written = cnt;
 
@@ -1023,15 +1018,13 @@ nfsd4_fallocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        __be32 status = nfserr_notsupp;
        struct file *file;
 
-       status = nfs4_preprocess_stateid_op(SVC_NET(rqstp), cstate,
+       status = nfs4_preprocess_stateid_op(rqstp, cstate,
                                            &fallocate->falloc_stateid,
-                                           WR_STATE, &file);
+                                           WR_STATE, &file, NULL);
        if (status != nfs_ok) {
                dprintk("NFSD: nfsd4_fallocate: couldn't process stateid!\n");
                return status;
        }
-       if (!file)
-               return nfserr_bad_stateid;
 
        status = nfsd4_vfs_fallocate(rqstp, &cstate->current_fh, file,
                                     fallocate->falloc_offset,
@@ -1064,15 +1057,13 @@ nfsd4_seek(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        __be32 status;
        struct file *file;
 
-       status = nfs4_preprocess_stateid_op(SVC_NET(rqstp), cstate,
+       status = nfs4_preprocess_stateid_op(rqstp, cstate,
                                            &seek->seek_stateid,
-                                           RD_STATE, &file);
+                                           RD_STATE, &file, NULL);
        if (status) {
                dprintk("NFSD: nfsd4_seek: couldn't process stateid!\n");
                return status;
        }
-       if (!file)
-               return nfserr_bad_stateid;
 
        switch (seek->seek_whence) {
        case NFS4_CONTENT_DATA:

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index f8d50817fafc8072ed2b90f18cc0d83657f9fec9..61dfb33f05593c1b19dff8a5346dee37a3539d79 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4576,6 +4576,9 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
 static struct file *
 nfs4_find_file(struct nfs4_stid *s, int flags)
 {
+       if (!s)
+               return NULL;
+
        switch (s->sc_type) {
        case NFS4_DELEG_STID:
                if (WARN_ON_ONCE(!s->sc_file->fi_deleg_file))
@@ -4607,27 +4610,63 @@ nfs4_check_olstateid(struct svc_fh *fhp, struct nfs4_ol_stateid *ols, int flags)
        return nfs4_check_openmode(ols, flags);
 }
 
+static __be32
+nfs4_check_file(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfs4_stid *s,
+               struct file **filpp, bool *tmp_file, int flags)
+{
+       int acc = (flags & RD_STATE) ? NFSD_MAY_READ : NFSD_MAY_WRITE;
+       struct file *file;
+       __be32 status;
+
+       file = nfs4_find_file(s, flags);
+       if (file) {
+               status = nfsd_permission(rqstp, fhp->fh_export, fhp->fh_dentry,
+                               acc | NFSD_MAY_OWNER_OVERRIDE);
+               if (status) {
+                       fput(file);
+                       return status;
+               }
+
+               *filpp = file;
+       } else {
+               status = nfsd_open(rqstp, fhp, S_IFREG, acc, filpp);
+               if (status)
+                       return status;
+
+               if (tmp_file)
+                       *tmp_file = true;
+       }
+
+       return 0;
+}
+
 /*
  * Checks for stateid operations
  */
 __be32
-nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate,
-                          stateid_t *stateid, int flags, struct file **filpp)
+nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,
+               struct nfsd4_compound_state *cstate, stateid_t *stateid,
+               int flags, struct file **filpp, bool *tmp_file)
 {
        struct svc_fh *fhp = &cstate->current_fh;
        struct inode *ino = d_inode(fhp->fh_dentry);
+       struct net *net = SVC_NET(rqstp);
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
-       struct nfs4_stid *s;
+       struct nfs4_stid *s = NULL;
        __be32 status;
 
        if (filpp)
                *filpp = NULL;
+       if (tmp_file)
+               *tmp_file = false;
 
        if (grace_disallows_io(net, ino))
                return nfserr_grace;
 
-       if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))
-               return check_special_stateids(net, fhp, stateid, flags);
+       if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) {
+               status = check_special_stateids(net, fhp, stateid, flags);
+               goto done;
+       }
 
        status = nfsd4_lookup_stateid(cstate, stateid,
                                NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID,
@@ -4652,13 +4691,12 @@ nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate,
                break;
        }
 
-       if (!status && filpp) {
-               *filpp = nfs4_find_file(s, flags);
-               if (!*filpp)
-                       status = nfserr_serverfault;
-       }
+done:
+       if (!status && filpp)
+               status = nfs4_check_file(rqstp, fhp, s, filpp, tmp_file, flags);
 out:
-       nfs4_put_stid(s);
+       if (s)
+               nfs4_put_stid(s);
        return status;
 }
 

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 5286206169bc5c5ec2ac56045851c4ee3ee2b442..3b3b3fbd9319fa0c6a21079a854e3e4bb308fe89 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -33,7 +33,6 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <linux/file.h>
 #include <linux/slab.h>
 #include <linux/namei.h>
 #include <linux/statfs.h>
@@ -3418,7 +3417,6 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
        unsigned long maxcount;
        struct xdr_stream *xdr = &resp->xdr;
        struct file *file = read->rd_filp;
-       struct svc_fh *fhp = read->rd_fhp;
        int starting_len = xdr->buf->len;
        struct raparms *ra = NULL;
        __be32 *p;
@@ -3442,20 +3440,8 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
        maxcount = min_t(unsigned long, maxcount, (xdr->buf->buflen - xdr->buf->len));
        maxcount = min_t(unsigned long, maxcount, read->rd_length);
 
-       if (read->rd_filp) {
-               err = nfsd_permission(resp->rqstp, fhp->fh_export,
-                               fhp->fh_dentry,
-                               NFSD_MAY_READ|NFSD_MAY_OWNER_OVERRIDE);
-               if (err)
-                       goto err_truncate;
-       } else {
-               err = nfsd_open(resp->rqstp, fhp, S_IFREG, NFSD_MAY_READ,
-                               &file);
-               if (err)
-                       goto err_truncate;
-
+       if (read->rd_tmp_file)
                ra = nfsd_init_raparms(file);
-       }
 
        if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags))
                err = nfsd4_encode_splice_read(resp, read, file, maxcount);
@@ -3464,10 +3450,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
 
        if (ra)
                nfsd_put_raparams(file, ra);
-       if (!read->rd_filp)
-               fput(file);
 
-err_truncate:
        if (err)
                xdr_truncate_encode(xdr, starting_len);
        return err;

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 4ed7c2ae95ebf436677ece730974e485f734d10a..4874ce515fc10024a5bda53e16511b43a8a5f603 100644 (file)
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -583,9 +583,9 @@ enum nfsd4_cb_op {
 struct nfsd4_compound_state;
 struct nfsd_net;
 
-extern __be32 nfs4_preprocess_stateid_op(struct net *net,
-               struct nfsd4_compound_state *cstate,
-               stateid_t *stateid, int flags, struct file **filp);
+extern __be32 nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,
+               struct nfsd4_compound_state *cstate, stateid_t *stateid,
+               int flags, struct file **filp, bool *tmp_file);
 __be32 nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
                     stateid_t *stateid, unsigned char typemask,
                     struct nfs4_stid **s, struct nfsd_net *nn);

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 52f2dd3898c4bfb3a66271cb1e0e75f735cb3494..b5e077a6e7d4d33d3da25bde15842d68199f6ae8 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -502,16 +502,11 @@ __be32 nfsd4_vfs_fallocate(struct svc_rqst *rqstp, struct svc_fh *fhp,
                           struct file *file, loff_t offset, loff_t len,
                           int flags)
 {
-       __be32 err;
        int error;
 
        if (!S_ISREG(file_inode(file)->i_mode))
                return nfserr_inval;
 
-       err = nfsd_permission(rqstp, fhp->fh_export, fhp->fh_dentry, NFSD_MAY_WRITE);
-       if (err)
-               return err;
-
        error = vfs_fallocate(file, flags, offset, len);
        if (!error)
                error = commit_metadata(fhp);
@@ -912,7 +907,7 @@ static int wait_for_concurrent_writes(struct file *file)
        return err;
 }
 
-static __be32
+__be32
 nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
                                loff_t offset, struct kvec *vec, int vlen,
                                unsigned long *cnt, int *stablep)

diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
index 053c4addbd9da934199740c01687d92bd8c49080..5be875e3e638c733d67bc3efff584e2022c4b18f 100644 (file)
--- a/fs/nfsd/vfs.h
+++ b/fs/nfsd/vfs.h
@@ -80,6 +80,10 @@ __be32               nfsd_read(struct svc_rqst *, struct svc_fh *,
                                loff_t, struct kvec *, int, unsigned long *);
 __be32                 nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *,
                                loff_t, struct kvec *,int, unsigned long *, int *);
+__be32         nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp,
+                               struct file *file, loff_t offset,
+                               struct kvec *vec, int vlen, unsigned long *cnt,
+                               int *stablep);
 __be32         nfsd_readlink(struct svc_rqst *, struct svc_fh *,
                                char *, int *);
 __be32         nfsd_symlink(struct svc_rqst *, struct svc_fh *,

diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index 2f8c092be2b3344901f07f2f16e0ee239034ccdf..9f991007a5781314d1473bf826062e59c8918ef8 100644 (file)
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -273,6 +273,7 @@ struct nfsd4_read {
        u32             rd_length;          /* request */
        int             rd_vlen;
        struct file     *rd_filp;
+       bool            rd_tmp_file;
        
        struct svc_rqst *rd_rqstp;          /* response */
        struct svc_fh * rd_fhp;             /* response */