Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7587364b authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: change cfs_hash_lock_ops_t to struct 



Change cfs_hash_lock_ops_t to struct cfs_hash_lock_ops.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b60a1d6

drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -272,7 +272,7 @@ struct cfs_hash { 
	char			hs_name[0];

	char			hs_name[0];

};

};





typedef struct cfs_hash_lock_ops {

struct cfs_hash_lock_ops {

	/** lock the hash table */

	/** lock the hash table */

	void    (*hs_lock)(union cfs_hash_lock *lock, int exclusive);

	void    (*hs_lock)(union cfs_hash_lock *lock, int exclusive);

	/** unlock the hash table */

	/** unlock the hash table */
@@ -281,7 +281,7 @@ typedef struct cfs_hash_lock_ops { 
	void    (*hs_bkt_lock)(union cfs_hash_lock *lock, int exclusive);

	void    (*hs_bkt_lock)(union cfs_hash_lock *lock, int exclusive);

	/** unlock the hash bucket */

	/** unlock the hash bucket */

	void    (*hs_bkt_unlock)(union cfs_hash_lock *lock, int exclusive);

	void    (*hs_bkt_unlock)(union cfs_hash_lock *lock, int exclusive);

} cfs_hash_lock_ops_t;

};





typedef struct cfs_hash_hlist_ops {

typedef struct cfs_hash_hlist_ops {

	/** return hlist_head of hash-head of @bd */

	/** return hlist_head of hash-head of @bd */

drivers/staging/lustre/lustre/libcfs/hash.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -159,7 +159,7 @@ cfs_hash_rw_unlock(union cfs_hash_lock *lock, int exclusive) 
}

}





/** No lock hash */

/** No lock hash */

static cfs_hash_lock_ops_t cfs_hash_nl_lops = {

static struct cfs_hash_lock_ops cfs_hash_nl_lops = {

	.hs_lock	= cfs_hash_nl_lock,

	.hs_lock	= cfs_hash_nl_lock,

	.hs_unlock      = cfs_hash_nl_unlock,

	.hs_unlock      = cfs_hash_nl_unlock,

	.hs_bkt_lock    = cfs_hash_nl_lock,

	.hs_bkt_lock    = cfs_hash_nl_lock,
@@ -167,7 +167,7 @@ static cfs_hash_lock_ops_t cfs_hash_nl_lops = { 
};

};





/** no bucket lock, one spinlock to protect everything */

/** no bucket lock, one spinlock to protect everything */

static cfs_hash_lock_ops_t cfs_hash_nbl_lops = {

static struct cfs_hash_lock_ops cfs_hash_nbl_lops = {

	.hs_lock	= cfs_hash_spin_lock,

	.hs_lock	= cfs_hash_spin_lock,

	.hs_unlock      = cfs_hash_spin_unlock,

	.hs_unlock      = cfs_hash_spin_unlock,

	.hs_bkt_lock    = cfs_hash_nl_lock,

	.hs_bkt_lock    = cfs_hash_nl_lock,
@@ -175,7 +175,7 @@ static cfs_hash_lock_ops_t cfs_hash_nbl_lops = { 
};

};





/** spin bucket lock, rehash is enabled */

/** spin bucket lock, rehash is enabled */

static cfs_hash_lock_ops_t cfs_hash_bkt_spin_lops = {

static struct cfs_hash_lock_ops cfs_hash_bkt_spin_lops = {

	.hs_lock	= cfs_hash_rw_lock,

	.hs_lock	= cfs_hash_rw_lock,

	.hs_unlock      = cfs_hash_rw_unlock,

	.hs_unlock      = cfs_hash_rw_unlock,

	.hs_bkt_lock    = cfs_hash_spin_lock,

	.hs_bkt_lock    = cfs_hash_spin_lock,
@@ -183,7 +183,7 @@ static cfs_hash_lock_ops_t cfs_hash_bkt_spin_lops = { 
};

};





/** rw bucket lock, rehash is enabled */

/** rw bucket lock, rehash is enabled */

static cfs_hash_lock_ops_t cfs_hash_bkt_rw_lops = {

static struct cfs_hash_lock_ops cfs_hash_bkt_rw_lops = {

	.hs_lock	= cfs_hash_rw_lock,

	.hs_lock	= cfs_hash_rw_lock,

	.hs_unlock      = cfs_hash_rw_unlock,

	.hs_unlock      = cfs_hash_rw_unlock,

	.hs_bkt_lock    = cfs_hash_rw_lock,

	.hs_bkt_lock    = cfs_hash_rw_lock,
@@ -191,7 +191,7 @@ static cfs_hash_lock_ops_t cfs_hash_bkt_rw_lops = { 
};

};





/** spin bucket lock, rehash is disabled */

/** spin bucket lock, rehash is disabled */

static cfs_hash_lock_ops_t cfs_hash_nr_bkt_spin_lops = {

static struct cfs_hash_lock_ops cfs_hash_nr_bkt_spin_lops = {

	.hs_lock	= cfs_hash_nl_lock,

	.hs_lock	= cfs_hash_nl_lock,

	.hs_unlock      = cfs_hash_nl_unlock,

	.hs_unlock      = cfs_hash_nl_unlock,

	.hs_bkt_lock    = cfs_hash_spin_lock,

	.hs_bkt_lock    = cfs_hash_spin_lock,
@@ -199,7 +199,7 @@ static cfs_hash_lock_ops_t cfs_hash_nr_bkt_spin_lops = { 
};

};





/** rw bucket lock, rehash is disabled */

/** rw bucket lock, rehash is disabled */

static cfs_hash_lock_ops_t cfs_hash_nr_bkt_rw_lops = {

static struct cfs_hash_lock_ops cfs_hash_nr_bkt_rw_lops = {

	.hs_lock	= cfs_hash_nl_lock,

	.hs_lock	= cfs_hash_nl_lock,

	.hs_unlock      = cfs_hash_nl_unlock,

	.hs_unlock      = cfs_hash_nl_unlock,

	.hs_bkt_lock    = cfs_hash_rw_lock,

	.hs_bkt_lock    = cfs_hash_rw_lock,