Skip to content

Commit

Permalink
nfsd: remove the client_mutex and the nfs4_lock/unlock_state wrappers
Browse files Browse the repository at this point in the history
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
  • Loading branch information
Jeff Layton authored and J. Bruce Fields committed Aug 5, 2014
1 parent 74cf76d commit b687f68
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
15 changes: 0 additions & 15 deletions fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ static void nfs4_free_ol_stateid(struct nfs4_stid *stid);

/* Locking: */

/* Currently used for almost all code touching nfsv4 state: */
static DEFINE_MUTEX(client_mutex);

/*
* Currently used for the del_recall_lru and file hash table. In an
* effort to decrease the scope of the client_mutex, this spinlock may
Expand All @@ -97,12 +94,6 @@ static struct kmem_cache *file_slab;
static struct kmem_cache *stateid_slab;
static struct kmem_cache *deleg_slab;

void
nfs4_lock_state(void)
{
mutex_lock(&client_mutex);
}

static void free_session(struct nfsd4_session *);

static bool is_session_dead(struct nfsd4_session *ses)
Expand All @@ -118,12 +109,6 @@ static __be32 mark_session_dead_locked(struct nfsd4_session *ses, int ref_held_b
return nfs_ok;
}

void
nfs4_unlock_state(void)
{
mutex_unlock(&client_mutex);
}

static bool is_client_expired(struct nfs4_client *clp)
{
return clp->cl_time == 0;
Expand Down
2 changes: 0 additions & 2 deletions fs/nfsd/state.h
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,6 @@ 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 void nfs4_lock_state(void);
extern void nfs4_unlock_state(void);
void nfs4_put_stid(struct nfs4_stid *s);
void nfs4_remove_reclaim_record(struct nfs4_client_reclaim *, struct nfsd_net *);
extern void nfs4_release_reclaim(struct nfsd_net *);
Expand Down

0 comments on commit b687f68

Please sign in to comment.