staging: lustre: obd: remove dead code (58c78cd2) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1937,8 +1937,8 @@ enum mds_cmd {
	MDS_DISCONNECT = 39,		MDS_DISCONNECT = 39,
	MDS_GETSTATUS = 40,		MDS_GETSTATUS = 40,
	MDS_STATFS = 41,		MDS_STATFS = 41,
	MDS_PIN = 42,		MDS_PIN = 42, /* obsolete, never used in a release */
	MDS_UNPIN = 43,		MDS_UNPIN = 43, /* obsolete, never used in a release */
	MDS_SYNC = 44,		MDS_SYNC = 44,
	MDS_DONE_WRITING = 45,		MDS_DONE_WRITING = 45,
	MDS_SET_INFO = 46,		MDS_SET_INFO = 46,
	@@ -1947,7 +1947,7 @@ enum mds_cmd {
	MDS_GETXATTR = 49,		MDS_GETXATTR = 49,
	MDS_SETXATTR = 50, /* obsolete, now it's MDS_REINT op */		MDS_SETXATTR = 50, /* obsolete, now it's MDS_REINT op */
	MDS_WRITEPAGE = 51,		MDS_WRITEPAGE = 51,
	MDS_IS_SUBDIR = 52,		MDS_IS_SUBDIR = 52, /* obsolete, never used in a release */
	MDS_GET_INFO = 53,		MDS_GET_INFO = 53,
	MDS_HSM_STATE_GET = 54,		MDS_HSM_STATE_GET = 54,
	MDS_HSM_STATE_SET = 55,		MDS_HSM_STATE_SET = 55,

drivers/staging/lustre/lustre/include/lustre_import.h

+0 −22

Original line number	Original line	Diff line number	Diff line
	@@ -305,28 +305,6 @@ struct obd_import {
	time64_t imp_last_reply_time; /* for health check */		time64_t imp_last_reply_time; /* for health check */
	};		};

	typedef void (obd_import_callback)(struct obd_import imp, void *closure,
	int event, void event_arg, void cb_data);

	/**
	* Structure for import observer.
	* It is possible to register "observer" on an import and every time
	* something happens to an import (like connect/evict/disconnect)
	* obderver will get its callback called with event type
	*/
	struct obd_import_observer {
	struct list_head oio_chain;
	obd_import_callback oio_cb;
	void *oio_cb_data;
	};

	void class_observe_import(struct obd_import *imp, obd_import_callback cb,
	void *cb_data);
	void class_unobserve_import(struct obd_import *imp, obd_import_callback cb,
	void *cb_data);
	void class_notify_import_observers(struct obd_import *imp, int event,
	void *event_arg);

	/* import.c */		/* import.c */
	static inline unsigned int at_est2timeout(unsigned int val)		static inline unsigned int at_est2timeout(unsigned int val)
	{		{

drivers/staging/lustre/lustre/include/lustre_log.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -277,12 +277,11 @@ static inline void llog_ctxt_put(struct llog_ctxt *ctxt)
	__llog_ctxt_put(NULL, ctxt);		__llog_ctxt_put(NULL, ctxt);
	}		}

	static inline void llog_group_init(struct obd_llog_group *olg, int group)		static inline void llog_group_init(struct obd_llog_group *olg)
	{		{
	init_waitqueue_head(&olg->olg_waitq);		init_waitqueue_head(&olg->olg_waitq);
	spin_lock_init(&olg->olg_lock);		spin_lock_init(&olg->olg_lock);
	mutex_init(&olg->olg_cat_processing);		mutex_init(&olg->olg_cat_processing);
	olg->olg_seq = group;
	}		}

	static inline int llog_group_set_ctxt(struct obd_llog_group *olg,		static inline int llog_group_set_ctxt(struct obd_llog_group *olg,

drivers/staging/lustre/lustre/include/lustre_req_layout.h

+0 −3

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

+0 −64

Original line number	Original line	Diff line number	Diff line
	@@ -243,7 +243,6 @@ struct client_obd {
	* the extent size. A chunk is max(PAGE_SIZE, OST block size)		* the extent size. A chunk is max(PAGE_SIZE, OST block size)
	*/		*/
	int cl_chunkbits;		int cl_chunkbits;
	int cl_chunk;
	int cl_extent_tax; /* extent overhead, by bytes */		int cl_extent_tax; /* extent overhead, by bytes */

	/* keep track of objects that have lois that contain pages which		/* keep track of objects that have lois that contain pages which
	@@ -442,7 +441,6 @@ struct niobuf_local {
	__u32 flags;		__u32 flags;
	struct page *page;		struct page *page;
	struct dentry *dentry;		struct dentry *dentry;
	int lnb_grant_used;
	int rc;		int rc;
	};		};

	@@ -485,7 +483,6 @@ struct niobuf_local {
	#define N_LOCAL_TEMP_PAGE 0x10000000		#define N_LOCAL_TEMP_PAGE 0x10000000

	struct obd_trans_info {		struct obd_trans_info {
	__u64 oti_transno;
	__u64 oti_xid;		__u64 oti_xid;
	/* Only used on the server side for tracking acks. */		/* Only used on the server side for tracking acks. */
	struct oti_req_ack_lock {		struct oti_req_ack_lock {
	@@ -495,50 +492,11 @@ struct obd_trans_info {
	void *oti_handle;		void *oti_handle;
	struct llog_cookie oti_onecookie;		struct llog_cookie oti_onecookie;
	struct llog_cookie *oti_logcookies;		struct llog_cookie *oti_logcookies;
	int oti_numcookies;
	/** synchronous write is needed */
	unsigned long oti_sync_write:1;

	/* initial thread handling transaction */
	struct ptlrpc_thread *oti_thread;
	__u32 oti_conn_cnt;
	/** VBR: versions */		/** VBR: versions */
	__u64 oti_pre_version;		__u64 oti_pre_version;
	/** JobID */
	char *oti_jobid;

	struct obd_uuid *oti_ost_uuid;
	};		};

	static inline void oti_alloc_cookies(struct obd_trans_info *oti,
	int num_cookies)
	{
	if (!oti)
	return;

	if (num_cookies == 1)
	oti->oti_logcookies = &oti->oti_onecookie;
	else
	oti->oti_logcookies = libcfs_kvzalloc(num_cookies * sizeof(oti->oti_onecookie),
	GFP_NOFS);

	oti->oti_numcookies = num_cookies;
	}

	static inline void oti_free_cookies(struct obd_trans_info *oti)
	{
	if (!oti \|\| !oti->oti_logcookies)
	return;

	if (oti->oti_logcookies == &oti->oti_onecookie)
	LASSERT(oti->oti_numcookies == 1);
	else
	kvfree(oti->oti_logcookies);

	oti->oti_logcookies = NULL;
	oti->oti_numcookies = 0;
	}

	/*		/*
	* Events signalled through obd_notify() upcall-chain.		* Events signalled through obd_notify() upcall-chain.
	*/		*/
	@@ -584,7 +542,6 @@ struct target_recovery_data {
	};		};

	struct obd_llog_group {		struct obd_llog_group {
	int olg_seq;
	struct llog_ctxt *olg_ctxts[LLOG_MAX_CTXTS];		struct llog_ctxt *olg_ctxts[LLOG_MAX_CTXTS];
	wait_queue_head_t olg_waitq;		wait_queue_head_t olg_waitq;
	spinlock_t olg_lock;		spinlock_t olg_lock;
	@@ -620,7 +577,6 @@ struct obd_device {
	obd_starting:1, /* started setup */		obd_starting:1, /* started setup */
	obd_force:1, /* cleanup with > 0 obd refcount */		obd_force:1, /* cleanup with > 0 obd refcount */
	obd_fail:1, /* cleanup with failover */		obd_fail:1, /* cleanup with failover */
	obd_async_recov:1, /* allow asynchronous orphan cleanup */
	obd_no_conn:1, /* deny new connections */		obd_no_conn:1, /* deny new connections */
	obd_inactive:1, /* device active/inactive		obd_inactive:1, /* device active/inactive
	* (for sysfs status only!!)		* (for sysfs status only!!)
	@@ -695,9 +651,6 @@ struct obd_device {
	struct completion obd_kobj_unregister;		struct completion obd_kobj_unregister;
	};		};

	#define OBD_LLOG_FL_SENDNOW 0x0001
	#define OBD_LLOG_FL_EXIT 0x0002

	enum obd_cleanup_stage {		enum obd_cleanup_stage {
	/* Special case hack for MDS LOVs */		/* Special case hack for MDS LOVs */
	OBD_CLEANUP_EARLY,		OBD_CLEANUP_EARLY,
	@@ -707,8 +660,6 @@ enum obd_cleanup_stage {

	/* get/set_info keys */		/* get/set_info keys */
	#define KEY_ASYNC "async"		#define KEY_ASYNC "async"
	#define KEY_BLOCKSIZE_BITS "blocksize_bits"
	#define KEY_BLOCKSIZE "blocksize"
	#define KEY_CHANGELOG_CLEAR "changelog_clear"		#define KEY_CHANGELOG_CLEAR "changelog_clear"
	#define KEY_FID2PATH "fid2path"		#define KEY_FID2PATH "fid2path"
	#define KEY_CHECKSUM "checksum"		#define KEY_CHECKSUM "checksum"
	@@ -720,13 +671,11 @@ enum obd_cleanup_stage {
	#define KEY_GRANT_SHRINK "grant_shrink"		#define KEY_GRANT_SHRINK "grant_shrink"
	#define KEY_HSM_COPYTOOL_SEND "hsm_send"		#define KEY_HSM_COPYTOOL_SEND "hsm_send"
	#define KEY_INIT_RECOV_BACKUP "init_recov_bk"		#define KEY_INIT_RECOV_BACKUP "init_recov_bk"
	#define KEY_INIT_RECOV "initial_recov"
	#define KEY_INTERMDS "inter_mds"		#define KEY_INTERMDS "inter_mds"
	#define KEY_LAST_ID "last_id"		#define KEY_LAST_ID "last_id"
	#define KEY_LAST_FID "last_fid"		#define KEY_LAST_FID "last_fid"
	#define KEY_LOCK_TO_STRIPE "lock_to_stripe"		#define KEY_LOCK_TO_STRIPE "lock_to_stripe"
	#define KEY_LOVDESC "lovdesc"		#define KEY_LOVDESC "lovdesc"
	#define KEY_LOV_IDX "lov_idx"
	#define KEY_MAX_EASIZE "max_easize"		#define KEY_MAX_EASIZE "max_easize"
	#define KEY_DEFAULT_EASIZE "default_easize"		#define KEY_DEFAULT_EASIZE "default_easize"
	#define KEY_MDS_CONN "mds_conn"		#define KEY_MDS_CONN "mds_conn"
	@@ -739,11 +688,9 @@ enum obd_cleanup_stage {
	/* KEY_SET_INFO in lustre_idl.h */		/* KEY_SET_INFO in lustre_idl.h */
	#define KEY_SPTLRPC_CONF "sptlrpc_conf"		#define KEY_SPTLRPC_CONF "sptlrpc_conf"
	#define KEY_CONNECT_FLAG "connect_flags"		#define KEY_CONNECT_FLAG "connect_flags"
	#define KEY_SYNC_LOCK_CANCEL "sync_lock_cancel"

	#define KEY_CACHE_SET "cache_set"		#define KEY_CACHE_SET "cache_set"
	#define KEY_CACHE_LRU_SHRINK "cache_lru_shrink"		#define KEY_CACHE_LRU_SHRINK "cache_lru_shrink"
	#define KEY_CHANGELOG_INDEX "changelog_index"

	struct lu_context;		struct lu_context;

	@@ -872,8 +819,6 @@ struct obd_ops {
	__u32 keylen, void *key,		__u32 keylen, void *key,
	__u32 vallen, void *val,		__u32 vallen, void *val,
	struct ptlrpc_request_set *set);		struct ptlrpc_request_set *set);
	int (attach)(struct obd_device dev, u32 len, void *data);
	int (detach)(struct obd_device dev);
	int (setup)(struct obd_device dev, struct lustre_cfg *cfg);		int (setup)(struct obd_device dev, struct lustre_cfg *cfg);
	int (precleanup)(struct obd_device dev,		int (precleanup)(struct obd_device dev,
	enum obd_cleanup_stage cleanup_stage);		enum obd_cleanup_stage cleanup_stage);
	@@ -1038,16 +983,11 @@ struct md_ops {
	int (rename)(struct obd_export , struct md_op_data *,		int (rename)(struct obd_export , struct md_op_data *,
	const char , int, const char , int,		const char , int, const char , int,
	struct ptlrpc_request **);		struct ptlrpc_request **);
	int (is_subdir)(struct obd_export , const struct lu_fid *,
	const struct lu_fid *,
	struct ptlrpc_request **);
	int (setattr)(struct obd_export , struct md_op_data , void ,		int (setattr)(struct obd_export , struct md_op_data , void ,
	int, void , int, struct ptlrpc_request *,		int, void , int, struct ptlrpc_request *,
	struct md_open_data **mod);		struct md_open_data **mod);
	int (sync)(struct obd_export , const struct lu_fid *,		int (sync)(struct obd_export , const struct lu_fid *,
	struct ptlrpc_request **);		struct ptlrpc_request **);
	int (readpage)(struct obd_export , struct md_op_data *,
	struct page , struct ptlrpc_request );
	int (read_page)(struct obd_export , struct md_op_data *,		int (read_page)(struct obd_export , struct md_op_data *,
	struct md_callback *cb_op, __u64 hash_offset,		struct md_callback *cb_op, __u64 hash_offset,
	struct page **ppage);		struct page **ppage);
	@@ -1141,10 +1081,6 @@ static inline const struct lsm_operations *lsm_op_find(int magic)
	}		}
	}		}

	/* Requests for obd_extent_calc() */
	#define OBD_CALC_STRIPE_START 1
	#define OBD_CALC_STRIPE_END 2

	static inline struct md_open_data *obd_mod_alloc(void)		static inline struct md_open_data *obd_mod_alloc(void)
	{		{
	struct md_open_data *mod;		struct md_open_data *mod;

Original line number	Original line	Diff line number	Diff line
	@@ -149,14 +149,11 @@ extern struct req_format RQF_MDS_GETATTR;
	extern struct req_format RQF_MDS_GETATTR_NAME;		extern struct req_format RQF_MDS_GETATTR_NAME;
	extern struct req_format RQF_MDS_CLOSE;		extern struct req_format RQF_MDS_CLOSE;
	extern struct req_format RQF_MDS_RELEASE_CLOSE;		extern struct req_format RQF_MDS_RELEASE_CLOSE;
	extern struct req_format RQF_MDS_PIN;
	extern struct req_format RQF_MDS_UNPIN;
	extern struct req_format RQF_MDS_CONNECT;		extern struct req_format RQF_MDS_CONNECT;
	extern struct req_format RQF_MDS_DISCONNECT;		extern struct req_format RQF_MDS_DISCONNECT;
	extern struct req_format RQF_MDS_GET_INFO;		extern struct req_format RQF_MDS_GET_INFO;
	extern struct req_format RQF_MDS_READPAGE;		extern struct req_format RQF_MDS_READPAGE;
	extern struct req_format RQF_MDS_WRITEPAGE;		extern struct req_format RQF_MDS_WRITEPAGE;
	extern struct req_format RQF_MDS_IS_SUBDIR;
	extern struct req_format RQF_MDS_DONE_WRITING;		extern struct req_format RQF_MDS_DONE_WRITING;
	extern struct req_format RQF_MDS_REINT;		extern struct req_format RQF_MDS_REINT;
	extern struct req_format RQF_MDS_REINT_CREATE;		extern struct req_format RQF_MDS_REINT_CREATE;