nfsd: make nfsd4_session->se_flags a bool

While this holds the flags from the CREATE_SESSION request, nothing
ever consults them. The only flag used is NFS4_SESSION_DEAD. Make it a
simple bool instead.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a19324a68fb3b7405955222cff9147e1dbe57814..a334f0a0e50ad62f447ad604b7e79d27629278f1 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -149,14 +149,14 @@ void nfsd4_destroy_laundry_wq(void)
 
 static bool is_session_dead(struct nfsd4_session *ses)
 {
-       return ses->se_flags & NFS4_SESSION_DEAD;
+       return ses->se_dead;
 }
 
 static __be32 mark_session_dead_locked(struct nfsd4_session *ses, int ref_held_by_me)
 {
        if (atomic_read(&ses->se_ref) > ref_held_by_me)
                return nfserr_jukebox;
-       ses->se_flags |= NFS4_SESSION_DEAD;
+       ses->se_dead = true;
        return nfs_ok;
 }
 
@@ -2133,7 +2133,7 @@ static void init_session(struct svc_rqst *rqstp, struct nfsd4_session *new, stru
        INIT_LIST_HEAD(&new->se_conns);
 
        new->se_cb_seq_nr = 1;
-       new->se_flags = cses->flags;
+       new->se_dead = false;
        new->se_cb_prog = cses->callback_prog;
        new->se_cb_sec = cses->cb_sec;
        atomic_set(&new->se_ref, 0);

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 2485e62347bd3690be8e598bc477a14011b2ed94..2f735492cf6c749301ba1e65c8ad2265b98bbe01 100644 (file)
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -296,11 +296,9 @@ struct nfsd4_conn {
  */
 struct nfsd4_session {
        atomic_t                se_ref;
+       bool                    se_dead;
        struct list_head        se_hash;        /* hash by sessionid */
        struct list_head        se_perclnt;
-/* See SESSION4_PERSIST, etc. for standard flags; this is internal-only: */
-#define NFS4_SESSION_DEAD      0x010
-       u32                     se_flags;
        struct nfs4_client      *se_client;
        struct nfs4_sessionid   se_sessionid;
        struct nfsd4_channel_attrs se_fchannel;