nfsd41: clientid handling

Extract the clientid from sessionid to set the op_clientid on open.
Verify that the clid for other stateful ops is zero for minorversion != 0
Do all other checks for stateful ops without sessions.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Andy Adamson <andros@netapp.com>
[fixed whitespace indent]
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
[nfsd41 remove sl_session from nfsd4_open]
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index aeb4888..3fdcca5 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -162,6 +162,15 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_
        return status;
 }
 
        return status;
 }
 

+static void
+copy_clientid(clientid_t *clid, struct nfsd4_session *session)
+{
+       struct nfsd4_sessionid *sid =
+                       (struct nfsd4_sessionid *)session->se_sessionid.data;
+
+       clid->cl_boot = sid->clientid.cl_boot;
+       clid->cl_id = sid->clientid.cl_id;
+}

 
 static __be32
 nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 
 static __be32
 nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,


@@ -178,6 +187,9 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        if (open->op_create && open->op_claim_type != NFS4_OPEN_CLAIM_NULL)
                return nfserr_inval;
 
        if (open->op_create && open->op_claim_type != NFS4_OPEN_CLAIM_NULL)
                return nfserr_inval;
 

+       if (nfsd4_has_session(cstate))
+               copy_clientid(&open->op_clientid, cstate->session);
+

        nfs4_lock_state();
 
        /* check seqid for replay. set nfs4_owner */
        nfs4_lock_state();
 
        /* check seqid for replay. set nfs4_owner */

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index bbaf3c9..d227f85 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -603,8 +603,8 @@ STALE_CLIENTID(clientid_t *clid)
 {
        if (clid->cl_boot == boot_time)
                return 0;
 {
        if (clid->cl_boot == boot_time)
                return 0;

-       dprintk("NFSD stale clientid (%08x/%08x)\n", 
-                       clid->cl_boot, clid->cl_id);
+       dprintk("NFSD stale clientid (%08x/%08x) boot_time %08lx\n",
+               clid->cl_boot, clid->cl_id, boot_time);

        return 1;
 }
 
        return 1;
 }
 


@@ -2965,8 +2965,9 @@ nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid,
                if (lock->lk_is_new) {
                        if (!sop->so_is_open_owner)
                                return nfserr_bad_stateid;
                if (lock->lk_is_new) {
                        if (!sop->so_is_open_owner)
                                return nfserr_bad_stateid;

-                       if (!same_clid(&clp->cl_clientid, lockclid))
-                              return nfserr_bad_stateid;
+                       if (!(flags & HAS_SESSION) &&
+                           !same_clid(&clp->cl_clientid, lockclid))
+                               return nfserr_bad_stateid;

                        /* stp is the open stateid */
                        status = nfs4_check_openmode(stp, lkflg);
                        if (status)
                        /* stp is the open stateid */
                        status = nfs4_check_openmode(stp, lkflg);
                        if (status)


@@ -3507,7 +3508,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                struct nfs4_file *fp;
                
                status = nfserr_stale_clientid;
                struct nfs4_file *fp;
                
                status = nfserr_stale_clientid;

-               if (STALE_CLIENTID(&lock->lk_new_clientid))
+               if (!nfsd4_has_session(cstate) &&
+                   STALE_CLIENTID(&lock->lk_new_clientid))

                        goto out;
 
                /* validate and update open stateid and open seqid */
                        goto out;
 
                /* validate and update open stateid and open seqid */


@@ -3661,7 +3663,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        nfs4_lock_state();
 
        status = nfserr_stale_clientid;
        nfs4_lock_state();
 
        status = nfserr_stale_clientid;

-       if (STALE_CLIENTID(&lockt->lt_clientid))
+       if (!nfsd4_has_session(cstate) && STALE_CLIENTID(&lockt->lt_clientid))

                goto out;
 
        if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0))) {
                goto out;
 
        if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0))) {

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 7fdee82..059d4aa 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -189,6 +189,11 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes)
        return p;
 }
 
        return p;
 }
 

+static int zero_clientid(clientid_t *clid)
+{
+       return (clid->cl_boot == 0) && (clid->cl_id == 0);
+}
+

 static int
 defer_free(struct nfsd4_compoundargs *argp,
                void (*release)(const void *), void *p)
 static int
 defer_free(struct nfsd4_compoundargs *argp,
                void (*release)(const void *), void *p)


@@ -584,6 +589,8 @@ nfsd4_decode_lockt(struct nfsd4_compoundargs *argp, struct nfsd4_lockt *lockt)
        READ_BUF(lockt->lt_owner.len);
        READMEM(lockt->lt_owner.data, lockt->lt_owner.len);
 
        READ_BUF(lockt->lt_owner.len);
        READMEM(lockt->lt_owner.data, lockt->lt_owner.len);
 

+       if (argp->minorversion && !zero_clientid(&lockt->lt_clientid))
+               return nfserr_inval;

        DECODE_TAIL;
 }
 
        DECODE_TAIL;
 }
 


@@ -994,6 +1001,8 @@ nfsd4_decode_release_lockowner(struct nfsd4_compoundargs *argp, struct nfsd4_rel
        READ_BUF(rlockowner->rl_owner.len);
        READMEM(rlockowner->rl_owner.data, rlockowner->rl_owner.len);
 
        READ_BUF(rlockowner->rl_owner.len);
        READMEM(rlockowner->rl_owner.data, rlockowner->rl_owner.len);
 

+       if (argp->minorversion && !zero_clientid(&rlockowner->rl_clientid))
+               return nfserr_inval;

        DECODE_TAIL;
 }
 
        DECODE_TAIL;
 }