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

Commit 7f2d15bb authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: Get rid of ldlm_policy_res_t typedef 



Directly use enum ldlm_policy_res everywhere.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da5ecb4d

drivers/staging/lustre/lustre/ldlm/ldlm_internal.h

+0 −2
Original line number Diff line number Diff line
@@ -218,8 +218,6 @@ enum ldlm_policy_res { 
	LDLM_POLICY_SKIP_LOCK

};



typedef enum ldlm_policy_res ldlm_policy_res_t;



#define LDLM_POOL_SYSFS_PRINT_int(v) sprintf(buf, "%d\n", v)

#define LDLM_POOL_SYSFS_SET_int(a, b) { a = b; }

#define LDLM_POOL_SYSFS_PRINT_u64(v) sprintf(buf, "%lld\n", v)

drivers/staging/lustre/lustre/ldlm/ldlm_request.c

+24 −25
Original line number Diff line number Diff line
@@ -1131,12 +1131,11 @@ EXPORT_SYMBOL(ldlm_cli_cancel_list_local); 
 * dirty data, to close a file, ...) or waiting for any RPCs in-flight (e.g.

 * readahead requests, ...)

 */

static ldlm_policy_res_t ldlm_cancel_no_wait_policy(struct ldlm_namespace *ns,

						    struct ldlm_lock *lock,

						    int unused, int added,

						    int count)

static enum ldlm_policy_res

ldlm_cancel_no_wait_policy(struct ldlm_namespace *ns, struct ldlm_lock *lock,

			   int unused, int added, int count)

{

	ldlm_policy_res_t result = LDLM_POLICY_CANCEL_LOCK;

	enum ldlm_policy_res result = LDLM_POLICY_CANCEL_LOCK;



	/* don't check added & count since we want to process all locks

	 * from unused list.
@@ -1168,7 +1167,7 @@ static ldlm_policy_res_t ldlm_cancel_no_wait_policy(struct ldlm_namespace *ns, 
 *

 * \retval LDLM_POLICY_CANCEL_LOCK cancel lock from LRU

 */

static ldlm_policy_res_t ldlm_cancel_lrur_policy(struct ldlm_namespace *ns,

static enum ldlm_policy_res ldlm_cancel_lrur_policy(struct ldlm_namespace *ns,

						    struct ldlm_lock *lock,

						    int unused, int added,

						    int count)
@@ -1214,7 +1213,7 @@ static ldlm_policy_res_t ldlm_cancel_lrur_policy(struct ldlm_namespace *ns, 
 *

 * \retval LDLM_POLICY_CANCEL_LOCK cancel lock from LRU

 */

static ldlm_policy_res_t ldlm_cancel_passed_policy(struct ldlm_namespace *ns,

static enum ldlm_policy_res ldlm_cancel_passed_policy(struct ldlm_namespace *ns,

						      struct ldlm_lock *lock,

						      int unused, int added,

						      int count)
@@ -1235,7 +1234,7 @@ static ldlm_policy_res_t ldlm_cancel_passed_policy(struct ldlm_namespace *ns, 
 *

 * \retval LDLM_POLICY_CANCEL_LOCK cancel lock from LRU

 */

static ldlm_policy_res_t ldlm_cancel_aged_policy(struct ldlm_namespace *ns,

static enum ldlm_policy_res ldlm_cancel_aged_policy(struct ldlm_namespace *ns,

						    struct ldlm_lock *lock,

						    int unused, int added,

						    int count)
@@ -1251,13 +1250,13 @@ static ldlm_policy_res_t ldlm_cancel_aged_policy(struct ldlm_namespace *ns, 
	return LDLM_POLICY_CANCEL_LOCK;

}



static ldlm_policy_res_t

static enum ldlm_policy_res

ldlm_cancel_lrur_no_wait_policy(struct ldlm_namespace *ns,

				struct ldlm_lock *lock,

				int unused, int added,

				int count)

{

	ldlm_policy_res_t result;

	enum ldlm_policy_res result;



	result = ldlm_cancel_lrur_policy(ns, lock, unused, added, count);

	if (result == LDLM_POLICY_KEEP_LOCK)
@@ -1275,10 +1274,9 @@ ldlm_cancel_lrur_no_wait_policy(struct ldlm_namespace *ns, 
 *

 * \retval LDLM_POLICY_CANCEL_LOCK cancel lock from LRU

 */

static ldlm_policy_res_t ldlm_cancel_default_policy(struct ldlm_namespace *ns,

						    struct ldlm_lock *lock,

						    int unused, int added,

						    int count)

static enum ldlm_policy_res

ldlm_cancel_default_policy(struct ldlm_namespace *ns, struct ldlm_lock *lock,

			   int unused, int added, int count)

{

	/* Stop LRU processing when we reach past count or have checked all

	 * locks in LRU.
@@ -1287,7 +1285,8 @@ static ldlm_policy_res_t ldlm_cancel_default_policy(struct ldlm_namespace *ns, 
		LDLM_POLICY_KEEP_LOCK : LDLM_POLICY_CANCEL_LOCK;

}



typedef ldlm_policy_res_t (*ldlm_cancel_lru_policy_t)(struct ldlm_namespace *,

typedef enum ldlm_policy_res (*ldlm_cancel_lru_policy_t)(

						      struct ldlm_namespace *,

						      struct ldlm_lock *, int,

						      int, int);
@@ -1368,7 +1367,7 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns, 
	LASSERT(pf);



	while (!list_empty(&ns->ns_unused_list)) {

		ldlm_policy_res_t result;

		enum ldlm_policy_res result;

		time_t last_use = 0;



		/* all unused locks */