staging/lustre: Get rid of ldlm_cancel_flags_t typedef (f833ee42) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/staging/lustre/lustre/include/lustre_dlm.h

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -533,12 +533,12 @@ struct ldlm_interval_tree {
	#define LUSTRE_TRACKS_LOCK_EXP_REFS (0)		#define LUSTRE_TRACKS_LOCK_EXP_REFS (0)

	/** Cancel flags. */		/** Cancel flags. */
	typedef enum {		enum ldlm_cancel_flags {
	LCF_ASYNC = 0x1, /* Cancel locks asynchronously. */		LCF_ASYNC = 0x1, /* Cancel locks asynchronously. */
	LCF_LOCAL = 0x2, /* Cancel locks locally, not notifing server */		LCF_LOCAL = 0x2, /* Cancel locks locally, not notifing server */
	LCF_BL_AST = 0x4, /* Cancel locks marked as LDLM_FL_BL_AST		LCF_BL_AST = 0x4, /* Cancel locks marked as LDLM_FL_BL_AST
	* in the same RPC */		* in the same RPC */
	} ldlm_cancel_flags_t;		};

	struct ldlm_flock {		struct ldlm_flock {
	__u64 start;		__u64 start;
	@@ -1245,24 +1245,26 @@ int ldlm_cli_enqueue_fini(struct obd_export exp, struct ptlrpc_request req,
	struct lustre_handle *lockh, int rc);		struct lustre_handle *lockh, int rc);
	int ldlm_cli_update_pool(struct ptlrpc_request *req);		int ldlm_cli_update_pool(struct ptlrpc_request *req);
	int ldlm_cli_cancel(struct lustre_handle *lockh,		int ldlm_cli_cancel(struct lustre_handle *lockh,
	ldlm_cancel_flags_t cancel_flags);		enum ldlm_cancel_flags cancel_flags);
	int ldlm_cli_cancel_unused(struct ldlm_namespace , const struct ldlm_res_id ,		int ldlm_cli_cancel_unused(struct ldlm_namespace , const struct ldlm_res_id ,
	ldlm_cancel_flags_t flags, void *opaque);		enum ldlm_cancel_flags flags, void *opaque);
	int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns,		int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns,
	const struct ldlm_res_id *res_id,		const struct ldlm_res_id *res_id,
	ldlm_policy_data_t *policy,		ldlm_policy_data_t *policy,
	enum ldlm_mode mode,		enum ldlm_mode mode,
	ldlm_cancel_flags_t flags,		enum ldlm_cancel_flags flags,
	void *opaque);		void *opaque);
	int ldlm_cancel_resource_local(struct ldlm_resource *res,		int ldlm_cancel_resource_local(struct ldlm_resource *res,
	struct list_head *cancels,		struct list_head *cancels,
	ldlm_policy_data_t *policy,		ldlm_policy_data_t *policy,
	enum ldlm_mode mode, __u64 lock_flags,		enum ldlm_mode mode, __u64 lock_flags,
	ldlm_cancel_flags_t cancel_flags, void *opaque);		enum ldlm_cancel_flags cancel_flags,
			void *opaque);
	int ldlm_cli_cancel_list_local(struct list_head *cancels, int count,		int ldlm_cli_cancel_list_local(struct list_head *cancels, int count,
	ldlm_cancel_flags_t flags);		enum ldlm_cancel_flags flags);
	int ldlm_cli_cancel_list(struct list_head *head, int count,		int ldlm_cli_cancel_list(struct list_head *head, int count,
	struct ptlrpc_request *req, ldlm_cancel_flags_t flags);		struct ptlrpc_request *req,
			enum ldlm_cancel_flags flags);
	/** @} ldlm_cli_api */		/** @} ldlm_cli_api */

	/* mds/handler.c */		/* mds/handler.c */

drivers/staging/lustre/lustre/include/obd.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1167,7 +1167,7 @@ struct md_ops {

	int (cancel_unused)(struct obd_export , const struct lu_fid *,		int (cancel_unused)(struct obd_export , const struct lu_fid *,
	ldlm_policy_data_t *, enum ldlm_mode,		ldlm_policy_data_t *, enum ldlm_mode,
	ldlm_cancel_flags_t flags, void *opaque);		enum ldlm_cancel_flags flags, void *opaque);

	int (get_remote_perm)(struct obd_export , const struct lu_fid *,		int (get_remote_perm)(struct obd_export , const struct lu_fid *,
	__u32, struct ptlrpc_request **);		__u32, struct ptlrpc_request **);

drivers/staging/lustre/lustre/include/obd_class.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1657,7 +1657,7 @@ static inline int md_cancel_unused(struct obd_export *exp,
	const struct lu_fid *fid,		const struct lu_fid *fid,
	ldlm_policy_data_t *policy,		ldlm_policy_data_t *policy,
	enum ldlm_mode mode,		enum ldlm_mode mode,
	ldlm_cancel_flags_t flags,		enum ldlm_cancel_flags flags,
	void *opaque)		void *opaque)
	{		{
	int rc;		int rc;

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -100,10 +100,10 @@ enum {
	};		};

	int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr,		int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr,
	ldlm_cancel_flags_t sync, int flags);		enum ldlm_cancel_flags sync, int flags);
	int ldlm_cancel_lru_local(struct ldlm_namespace *ns,		int ldlm_cancel_lru_local(struct ldlm_namespace *ns,
	struct list_head *cancels, int count, int max,		struct list_head *cancels, int count, int max,
	ldlm_cancel_flags_t cancel_flags, int flags);		enum ldlm_cancel_flags cancel_flags, int flags);
	extern int ldlm_enqueue_min;		extern int ldlm_enqueue_min;

	/* ldlm_resource.c */		/* ldlm_resource.c */
	@@ -154,7 +154,7 @@ int ldlm_bl_to_thread_lock(struct ldlm_namespace ns, struct ldlm_lock_desc ld,
	int ldlm_bl_to_thread_list(struct ldlm_namespace *ns,		int ldlm_bl_to_thread_list(struct ldlm_namespace *ns,
	struct ldlm_lock_desc *ld,		struct ldlm_lock_desc *ld,
	struct list_head *cancels, int count,		struct list_head *cancels, int count,
	ldlm_cancel_flags_t cancel_flags);		enum ldlm_cancel_flags cancel_flags);

	void ldlm_handle_bl_callback(struct ldlm_namespace *ns,		void ldlm_handle_bl_callback(struct ldlm_namespace *ns,
	struct ldlm_lock_desc ld, struct ldlm_lock lock);		struct ldlm_lock_desc ld, struct ldlm_lock lock);

drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -107,7 +107,7 @@ struct ldlm_bl_work_item {
	struct list_head blwi_head;		struct list_head blwi_head;
	int blwi_count;		int blwi_count;
	struct completion blwi_comp;		struct completion blwi_comp;
	ldlm_cancel_flags_t blwi_flags;		enum ldlm_cancel_flags blwi_flags;
	int blwi_mem_pressure;		int blwi_mem_pressure;
	};		};

	@@ -353,7 +353,7 @@ static int ldlm_callback_reply(struct ptlrpc_request *req, int rc)
	}		}

	static int __ldlm_bl_to_thread(struct ldlm_bl_work_item *blwi,		static int __ldlm_bl_to_thread(struct ldlm_bl_work_item *blwi,
	ldlm_cancel_flags_t cancel_flags)		enum ldlm_cancel_flags cancel_flags)
	{		{
	struct ldlm_bl_pool *blp = ldlm_state->ldlm_bl_pool;		struct ldlm_bl_pool *blp = ldlm_state->ldlm_bl_pool;

	@@ -383,7 +383,7 @@ static inline void init_blwi(struct ldlm_bl_work_item *blwi,
	struct ldlm_lock_desc *ld,		struct ldlm_lock_desc *ld,
	struct list_head *cancels, int count,		struct list_head *cancels, int count,
	struct ldlm_lock *lock,		struct ldlm_lock *lock,
	ldlm_cancel_flags_t cancel_flags)		enum ldlm_cancel_flags cancel_flags)
	{		{
	init_completion(&blwi->blwi_comp);		init_completion(&blwi->blwi_comp);
	INIT_LIST_HEAD(&blwi->blwi_head);		INIT_LIST_HEAD(&blwi->blwi_head);
	@@ -417,7 +417,7 @@ static int ldlm_bl_to_thread(struct ldlm_namespace *ns,
	struct ldlm_lock_desc *ld,		struct ldlm_lock_desc *ld,
	struct ldlm_lock *lock,		struct ldlm_lock *lock,
	struct list_head *cancels, int count,		struct list_head *cancels, int count,
	ldlm_cancel_flags_t cancel_flags)		enum ldlm_cancel_flags cancel_flags)
	{		{
	if (cancels && count == 0)		if (cancels && count == 0)
	return 0;		return 0;
	@@ -451,7 +451,7 @@ int ldlm_bl_to_thread_lock(struct ldlm_namespace ns, struct ldlm_lock_desc ld,

	int ldlm_bl_to_thread_list(struct ldlm_namespace ns, struct ldlm_lock_desc ld,		int ldlm_bl_to_thread_list(struct ldlm_namespace ns, struct ldlm_lock_desc ld,
	struct list_head *cancels, int count,		struct list_head *cancels, int count,
	ldlm_cancel_flags_t cancel_flags)		enum ldlm_cancel_flags cancel_flags)
	{		{
	return ldlm_bl_to_thread(ns, ld, NULL, cancels, count, cancel_flags);		return ldlm_bl_to_thread(ns, ld, NULL, cancels, count, cancel_flags);
	}		}