staging/lustre/llog: remove unused server code (8c85bd76) · Commits · 戴 / test

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

+2 −72

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,6 @@

	#include "obd_class.h"		#include "obd_class.h"
	#include "lustre/lustre_idl.h"		#include "lustre/lustre_idl.h"
	#include "dt_object.h"

	#define LOG_NAME_LIMIT(logname, name) \		#define LOG_NAME_LIMIT(logname, name) \
	snprintf(logname, sizeof(logname), "LOGS/%s", name)		snprintf(logname, sizeof(logname), "LOGS/%s", name)
	@@ -117,24 +116,15 @@ struct llog_handle;
	/* llog.c - general API */		/* llog.c - general API */
	int llog_init_handle(const struct lu_env env, struct llog_handle handle,		int llog_init_handle(const struct lu_env env, struct llog_handle handle,
	int flags, struct obd_uuid *uuid);		int flags, struct obd_uuid *uuid);
	int llog_copy_handler(const struct lu_env env, struct llog_handle llh,
	struct llog_rec_hdr rec, void data);
	int llog_process(const struct lu_env env, struct llog_handle loghandle,		int llog_process(const struct lu_env env, struct llog_handle loghandle,
	llog_cb_t cb, void data, void catdata);		llog_cb_t cb, void data, void catdata);
	int llog_process_or_fork(const struct lu_env *env,		int llog_process_or_fork(const struct lu_env *env,
	struct llog_handle *loghandle,		struct llog_handle *loghandle,
	llog_cb_t cb, void data, void catdata, bool fork);		llog_cb_t cb, void data, void catdata, bool fork);
	int llog_reverse_process(const struct lu_env *env,
	struct llog_handle *loghandle, llog_cb_t cb,
	void data, void catdata);
	int llog_cancel_rec(const struct lu_env env, struct llog_handle loghandle,
	int index);
	int llog_open(const struct lu_env env, struct llog_ctxt ctxt,		int llog_open(const struct lu_env env, struct llog_ctxt ctxt,
	struct llog_handle *lgh, struct llog_logid logid,		struct llog_handle *lgh, struct llog_logid logid,
	char *name, enum llog_open_param open_param);		char *name, enum llog_open_param open_param);
	int llog_close(const struct lu_env env, struct llog_handle cathandle);		int llog_close(const struct lu_env env, struct llog_handle cathandle);
	int llog_is_empty(const struct lu_env env, struct llog_ctxt ctxt,
	char *name);
	int llog_backup(const struct lu_env env, struct obd_device obd,		int llog_backup(const struct lu_env env, struct obd_device obd,
	struct llog_ctxt ctxt, struct llog_ctxt bak_ctxt,		struct llog_ctxt ctxt, struct llog_ctxt bak_ctxt,
	char name, char backup);		char name, char backup);
	@@ -172,29 +162,14 @@ struct llog_process_cat_data {
	int lpcd_last_idx;		int lpcd_last_idx;
	};		};

			struct thandle;

	int llog_cat_close(const struct lu_env env, struct llog_handle cathandle);		int llog_cat_close(const struct lu_env env, struct llog_handle cathandle);
	int llog_cat_add_rec(const struct lu_env env, struct llog_handle cathandle,
	struct llog_rec_hdr rec, struct llog_cookie reccookie,
	void buf, struct thandle th);
	int llog_cat_declare_add_rec(const struct lu_env *env,
	struct llog_handle *cathandle,
	struct llog_rec_hdr rec, struct thandle th);
	int llog_cat_add(const struct lu_env env, struct llog_handle cathandle,
	struct llog_rec_hdr rec, struct llog_cookie reccookie,
	void *buf);
	int llog_cat_cancel_records(const struct lu_env *env,
	struct llog_handle *cathandle, int count,
	struct llog_cookie *cookies);
	int llog_cat_process_or_fork(const struct lu_env *env,		int llog_cat_process_or_fork(const struct lu_env *env,
	struct llog_handle *cat_llh, llog_cb_t cb,		struct llog_handle *cat_llh, llog_cb_t cb,
	void *data, int startcat, int startidx, bool fork);		void *data, int startcat, int startidx, bool fork);
	int llog_cat_process(const struct lu_env env, struct llog_handle cat_llh,		int llog_cat_process(const struct lu_env env, struct llog_handle cat_llh,
	llog_cb_t cb, void *data, int startcat, int startidx);		llog_cb_t cb, void *data, int startcat, int startidx);
	int llog_cat_reverse_process(const struct lu_env *env,
	struct llog_handle *cat_llh, llog_cb_t cb,
	void *data);
	int llog_cat_init_and_process(const struct lu_env *env,
	struct llog_handle *llh);

	/* llog_obd.c */		/* llog_obd.c */
	int llog_setup(const struct lu_env env, struct obd_device obd,		int llog_setup(const struct lu_env env, struct obd_device obd,
	@@ -202,16 +177,11 @@ int llog_setup(const struct lu_env env, struct obd_device obd,
	struct obd_device disk_obd, struct llog_operations op);		struct obd_device disk_obd, struct llog_operations op);
	int __llog_ctxt_put(const struct lu_env env, struct llog_ctxt ctxt);		int __llog_ctxt_put(const struct lu_env env, struct llog_ctxt ctxt);
	int llog_cleanup(const struct lu_env env, struct llog_ctxt );		int llog_cleanup(const struct lu_env env, struct llog_ctxt );
	int llog_sync(struct llog_ctxt ctxt, struct obd_export exp, int flags);
	int llog_cancel(const struct lu_env env, struct llog_ctxt ctxt,
	struct llog_cookie *cookies, int flags);

	/* llog_net.c */		/* llog_net.c */
	int llog_initiator_connect(struct llog_ctxt *ctxt);		int llog_initiator_connect(struct llog_ctxt *ctxt);

	struct llog_operations {		struct llog_operations {
	int (lop_destroy)(const struct lu_env env,
	struct llog_handle *handle);
	int (lop_next_block)(const struct lu_env env, struct llog_handle *h,		int (lop_next_block)(const struct lu_env env, struct llog_handle *h,
	int curr_idx, int next_idx, __u64 offset,		int curr_idx, int next_idx, __u64 offset,
	void *buf, int len);		void *buf, int len);
	@@ -254,8 +224,6 @@ struct llog_operations {
	int (lop_declare_create)(const struct lu_env env,		int (lop_declare_create)(const struct lu_env env,
	struct llog_handle *handle,		struct llog_handle *handle,
	struct thandle *th);		struct thandle *th);
	int (lop_create)(const struct lu_env env, struct llog_handle *handle,
	struct thandle *th);
	/**		/**
	* write new record in llog. It appends records usually but can edit		* write new record in llog. It appends records usually but can edit
	* existing records too.		* existing records too.
	@@ -287,8 +255,6 @@ struct llog_handle {
	spinlock_t lgh_hdr_lock; /* protect lgh_hdr data */		spinlock_t lgh_hdr_lock; /* protect lgh_hdr data */
	struct llog_logid lgh_id; /* id of this log */		struct llog_logid lgh_id; /* id of this log */
	struct llog_log_hdr *lgh_hdr;		struct llog_log_hdr *lgh_hdr;
	struct file *lgh_file;
	struct dt_object *lgh_obj;
	int lgh_last_idx;		int lgh_last_idx;
	int lgh_cur_idx; /* used during llog_process */		int lgh_cur_idx; /* used during llog_process */
	__u64 lgh_cur_offset; /* used during llog_process */		__u64 lgh_cur_offset; /* used during llog_process */
	@@ -318,7 +284,6 @@ struct llog_ctxt {
	struct mutex loc_mutex; /* protect loc_imp */		struct mutex loc_mutex; /* protect loc_imp */
	atomic_t loc_refcount;		atomic_t loc_refcount;
	long loc_flags; /* flags, see above defines */		long loc_flags; /* flags, see above defines */
	struct dt_object *loc_dir;
	};		};

	#define LLOG_PROC_BREAK 0x0001		#define LLOG_PROC_BREAK 0x0001
	@@ -440,22 +405,6 @@ static inline int llog_ctxt_null(struct obd_device *obd, int index)
	return llog_group_ctxt_null(&obd->obd_olg, index);		return llog_group_ctxt_null(&obd->obd_olg, index);
	}		}

	static inline int llog_destroy(const struct lu_env *env,
	struct llog_handle *handle)
	{
	struct llog_operations *lop;
	int rc;

	rc = llog_handle2ops(handle, &lop);
	if (rc)
	return rc;
	if (lop->lop_destroy == NULL)
	return -EOPNOTSUPP;

	rc = lop->lop_destroy(env, handle);
	return rc;
	}

	static inline int llog_next_block(const struct lu_env *env,		static inline int llog_next_block(const struct lu_env *env,
	struct llog_handle loghandle, int cur_idx,		struct llog_handle loghandle, int cur_idx,
	int next_idx, __u64 cur_offset, void buf,		int next_idx, __u64 cur_offset, void buf,
	@@ -510,11 +459,6 @@ static inline int llog_connect(struct llog_ctxt *ctxt,
	}		}

	/* llog.c */		/* llog.c */
	int llog_exist(struct llog_handle *loghandle);
	int llog_declare_create(const struct lu_env *env,
	struct llog_handle loghandle, struct thandle th);
	int llog_create(const struct lu_env env, struct llog_handle handle,
	struct thandle *th);
	int llog_declare_write_rec(const struct lu_env *env,		int llog_declare_write_rec(const struct lu_env *env,
	struct llog_handle *handle,		struct llog_handle *handle,
	struct llog_rec_hdr *rec, int idx,		struct llog_rec_hdr *rec, int idx,
	@@ -522,24 +466,10 @@ int llog_declare_write_rec(const struct lu_env *env,
	int llog_write_rec(const struct lu_env env, struct llog_handle handle,		int llog_write_rec(const struct lu_env env, struct llog_handle handle,
	struct llog_rec_hdr rec, struct llog_cookie logcookies,		struct llog_rec_hdr rec, struct llog_cookie logcookies,
	int numcookies, void buf, int idx, struct thandle th);		int numcookies, void buf, int idx, struct thandle th);
	int llog_add(const struct lu_env env, struct llog_handle lgh,
	struct llog_rec_hdr rec, struct llog_cookie logcookies,
	void buf, struct thandle th);
	int llog_declare_add(const struct lu_env env, struct llog_handle lgh,
	struct llog_rec_hdr rec, struct thandle th);
	int lustre_process_log(struct super_block sb, char logname,		int lustre_process_log(struct super_block sb, char logname,
	struct config_llog_instance *cfg);		struct config_llog_instance *cfg);
	int lustre_end_log(struct super_block sb, char logname,		int lustre_end_log(struct super_block sb, char logname,
	struct config_llog_instance *cfg);		struct config_llog_instance *cfg);
	int llog_open_create(const struct lu_env env, struct llog_ctxt ctxt,
	struct llog_handle *res, struct llog_logid logid,
	char *name);
	int llog_erase(const struct lu_env env, struct llog_ctxt ctxt,
	struct llog_logid logid, char name);
	int llog_write(const struct lu_env env, struct llog_handle loghandle,
	struct llog_rec_hdr rec, struct llog_cookie reccookie,
	int cookiecount, void *buf, int idx);

	/** @} log */		/** @} log */

	#endif		#endif

drivers/staging/lustre/lustre/obdclass/llog.c

+0 −544

Original line number	Original line	Diff line number	Diff line
	@@ -105,66 +105,6 @@ void llog_handle_put(struct llog_handle *loghandle)
	llog_free_handle(loghandle);		llog_free_handle(loghandle);
	}		}

	/* returns negative on error; 0 if success; 1 if success & log destroyed */
	int llog_cancel_rec(const struct lu_env env, struct llog_handle loghandle,
	int index)
	{
	struct llog_log_hdr *llh = loghandle->lgh_hdr;
	int rc = 0;

	CDEBUG(D_RPCTRACE, "Canceling %d in log "DOSTID"\n",
	index, POSTID(&loghandle->lgh_id.lgl_oi));

	if (index == 0) {
	CERROR("Can't cancel index 0 which is header\n");
	return -EINVAL;
	}

	spin_lock(&loghandle->lgh_hdr_lock);
	if (!ext2_clear_bit(index, llh->llh_bitmap)) {
	spin_unlock(&loghandle->lgh_hdr_lock);
	CDEBUG(D_RPCTRACE, "Catalog index %u already clear?\n", index);
	return -ENOENT;
	}

	llh->llh_count--;

	if ((llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
	(llh->llh_count == 1) &&
	(loghandle->lgh_last_idx == (LLOG_BITMAP_BYTES * 8) - 1)) {
	spin_unlock(&loghandle->lgh_hdr_lock);
	rc = llog_destroy(env, loghandle);
	if (rc < 0) {
	CERROR("%s: can't destroy empty llog #"DOSTID
	"#%08x: rc = %d\n",
	loghandle->lgh_ctxt->loc_obd->obd_name,
	POSTID(&loghandle->lgh_id.lgl_oi),
	loghandle->lgh_id.lgl_ogen, rc);
	goto out_err;
	}
	return 1;
	}
	spin_unlock(&loghandle->lgh_hdr_lock);

	rc = llog_write(env, loghandle, &llh->llh_hdr, NULL, 0, NULL, 0);
	if (rc < 0) {
	CERROR("%s: fail to write header for llog #"DOSTID
	"#%08x: rc = %d\n",
	loghandle->lgh_ctxt->loc_obd->obd_name,
	POSTID(&loghandle->lgh_id.lgl_oi),
	loghandle->lgh_id.lgl_ogen, rc);
	goto out_err;
	}
	return 0;
	out_err:
	spin_lock(&loghandle->lgh_hdr_lock);
	ext2_set_bit(index, llh->llh_bitmap);
	llh->llh_count++;
	spin_unlock(&loghandle->lgh_hdr_lock);
	return rc;
	}
	EXPORT_SYMBOL(llog_cancel_rec);

	static int llog_read_header(const struct lu_env *env,		static int llog_read_header(const struct lu_env *env,
	struct llog_handle *handle,		struct llog_handle *handle,
	struct obd_uuid *uuid)		struct obd_uuid *uuid)
	@@ -373,14 +313,6 @@ repeat:
	rc = lpi->lpi_cb(lpi->lpi_env, loghandle, rec,		rc = lpi->lpi_cb(lpi->lpi_env, loghandle, rec,
	lpi->lpi_cbdata);		lpi->lpi_cbdata);
	last_called_index = index;		last_called_index = index;
	if (rc == LLOG_PROC_BREAK) {
	goto out;
	} else if (rc == LLOG_DEL_RECORD) {
	llog_cancel_rec(lpi->lpi_env,
	loghandle,
	rec->lrh_index);
	rc = 0;
	}
	if (rc)		if (rc)
	goto out;		goto out;
	} else {		} else {
	@@ -475,380 +407,6 @@ int llog_process(const struct lu_env env, struct llog_handle loghandle,
	}		}
	EXPORT_SYMBOL(llog_process);		EXPORT_SYMBOL(llog_process);

	int llog_reverse_process(const struct lu_env *env,
	struct llog_handle *loghandle, llog_cb_t cb,
	void data, void catdata)
	{
	struct llog_log_hdr *llh = loghandle->lgh_hdr;
	struct llog_process_cat_data *cd = catdata;
	void *buf;
	int rc = 0, first_index = 1, index, idx;

	buf = kzalloc(LLOG_CHUNK_SIZE, GFP_NOFS);
	if (!buf)
	return -ENOMEM;

	if (cd != NULL)
	first_index = cd->lpcd_first_idx + 1;
	if (cd != NULL && cd->lpcd_last_idx)
	index = cd->lpcd_last_idx;
	else
	index = LLOG_BITMAP_BYTES * 8 - 1;

	while (rc == 0) {
	struct llog_rec_hdr *rec;
	struct llog_rec_tail *tail;

	/* skip records not set in bitmap */
	while (index >= first_index &&
	!ext2_test_bit(index, llh->llh_bitmap))
	--index;

	LASSERT(index >= first_index - 1);
	if (index == first_index - 1)
	break;

	/* get the buf with our target record; avoid old garbage */
	memset(buf, 0, LLOG_CHUNK_SIZE);
	rc = llog_prev_block(env, loghandle, index, buf,
	LLOG_CHUNK_SIZE);
	if (rc)
	goto out;

	rec = buf;
	idx = rec->lrh_index;
	CDEBUG(D_RPCTRACE, "index %u : idx %u\n", index, idx);
	while (idx < index) {
	rec = (void *)rec + rec->lrh_len;
	if (LLOG_REC_HDR_NEEDS_SWABBING(rec))
	lustre_swab_llog_rec(rec);
	idx++;
	}
	LASSERT(idx == index);
	tail = (void )rec + rec->lrh_len - sizeof(tail);

	/* process records in buffer, starting where we found one */
	while ((void *)tail > buf) {
	if (tail->lrt_index == 0) {
	/* no more records */
	rc = 0;
	goto out;
	}

	/* if set, process the callback on this record */
	if (ext2_test_bit(index, llh->llh_bitmap)) {
	rec = (void *)tail - tail->lrt_len +
	sizeof(*tail);

	rc = cb(env, loghandle, rec, data);
	if (rc == LLOG_PROC_BREAK) {
	goto out;
	} else if (rc == LLOG_DEL_RECORD) {
	llog_cancel_rec(env, loghandle,
	tail->lrt_index);
	rc = 0;
	}
	if (rc)
	goto out;
	}

	/* previous record, still in buffer? */
	--index;
	if (index < first_index) {
	rc = 0;
	goto out;
	}
	tail = (void *)tail - tail->lrt_len;
	}
	}

	out:
	kfree(buf);
	return rc;
	}
	EXPORT_SYMBOL(llog_reverse_process);

	/**
	* new llog API
	*
	* API functions:
	* llog_open - open llog, may not exist
	* llog_exist - check if llog exists
	* llog_close - close opened llog, pair for open, frees llog_handle
	* llog_declare_create - declare llog creation
	* llog_create - create new llog on disk, need transaction handle
	* llog_declare_write_rec - declaration of llog write
	* llog_write_rec - write llog record on disk, need transaction handle
	* llog_declare_add - declare llog catalog record addition
	* llog_add - add llog record in catalog, need transaction handle
	*/
	int llog_exist(struct llog_handle *loghandle)
	{
	struct llog_operations *lop;
	int rc;

	rc = llog_handle2ops(loghandle, &lop);
	if (rc)
	return rc;
	if (lop->lop_exist == NULL)
	return -EOPNOTSUPP;

	rc = lop->lop_exist(loghandle);
	return rc;
	}
	EXPORT_SYMBOL(llog_exist);

	int llog_declare_create(const struct lu_env *env,
	struct llog_handle loghandle, struct thandle th)
	{
	struct llog_operations *lop;
	int raised, rc;

	rc = llog_handle2ops(loghandle, &lop);
	if (rc)
	return rc;
	if (lop->lop_declare_create == NULL)
	return -EOPNOTSUPP;

	raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
	if (!raised)
	cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
	rc = lop->lop_declare_create(env, loghandle, th);
	if (!raised)
	cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
	return rc;
	}
	EXPORT_SYMBOL(llog_declare_create);

	int llog_create(const struct lu_env env, struct llog_handle handle,
	struct thandle *th)
	{
	struct llog_operations *lop;
	int raised, rc;

	rc = llog_handle2ops(handle, &lop);
	if (rc)
	return rc;
	if (lop->lop_create == NULL)
	return -EOPNOTSUPP;

	raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
	if (!raised)
	cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
	rc = lop->lop_create(env, handle, th);
	if (!raised)
	cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
	return rc;
	}
	EXPORT_SYMBOL(llog_create);

	int llog_declare_write_rec(const struct lu_env *env,
	struct llog_handle *handle,
	struct llog_rec_hdr *rec, int idx,
	struct thandle *th)
	{
	struct llog_operations *lop;
	int raised, rc;

	rc = llog_handle2ops(handle, &lop);
	if (rc)
	return rc;
	LASSERT(lop);
	if (lop->lop_declare_write_rec == NULL)
	return -EOPNOTSUPP;

	raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
	if (!raised)
	cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
	rc = lop->lop_declare_write_rec(env, handle, rec, idx, th);
	if (!raised)
	cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
	return rc;
	}
	EXPORT_SYMBOL(llog_declare_write_rec);

	int llog_write_rec(const struct lu_env env, struct llog_handle handle,
	struct llog_rec_hdr rec, struct llog_cookie logcookies,
	int numcookies, void buf, int idx, struct thandle th)
	{
	struct llog_operations *lop;
	int raised, rc, buflen;

	rc = llog_handle2ops(handle, &lop);
	if (rc)
	return rc;

	LASSERT(lop);
	if (lop->lop_write_rec == NULL)
	return -EOPNOTSUPP;

	if (buf)
	buflen = rec->lrh_len + sizeof(struct llog_rec_hdr) +
	sizeof(struct llog_rec_tail);
	else
	buflen = rec->lrh_len;
	LASSERT(cfs_size_round(buflen) == buflen);

	raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
	if (!raised)
	cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
	rc = lop->lop_write_rec(env, handle, rec, logcookies, numcookies,
	buf, idx, th);
	if (!raised)
	cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
	return rc;
	}
	EXPORT_SYMBOL(llog_write_rec);

	int llog_add(const struct lu_env env, struct llog_handle lgh,
	struct llog_rec_hdr rec, struct llog_cookie logcookies,
	void buf, struct thandle th)
	{
	int raised, rc;

	if (lgh->lgh_logops->lop_add == NULL)
	return -EOPNOTSUPP;

	raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
	if (!raised)
	cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
	rc = lgh->lgh_logops->lop_add(env, lgh, rec, logcookies, buf, th);
	if (!raised)
	cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
	return rc;
	}
	EXPORT_SYMBOL(llog_add);

	int llog_declare_add(const struct lu_env env, struct llog_handle lgh,
	struct llog_rec_hdr rec, struct thandle th)
	{
	int raised, rc;

	if (lgh->lgh_logops->lop_declare_add == NULL)
	return -EOPNOTSUPP;

	raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
	if (!raised)
	cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
	rc = lgh->lgh_logops->lop_declare_add(env, lgh, rec, th);
	if (!raised)
	cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
	return rc;
	}
	EXPORT_SYMBOL(llog_declare_add);

	/**
	* Helper function to open llog or create it if doesn't exist.
	* It hides all transaction handling from caller.
	*/
	int llog_open_create(const struct lu_env env, struct llog_ctxt ctxt,
	struct llog_handle *res, struct llog_logid logid,
	char *name)
	{
	struct dt_device *d;
	struct thandle *th;
	int rc;

	rc = llog_open(env, ctxt, res, logid, name, LLOG_OPEN_NEW);
	if (rc)
	return rc;

	if (llog_exist(*res))
	return 0;

	LASSERT((*res)->lgh_obj != NULL);

	d = lu2dt_dev((*res)->lgh_obj->do_lu.lo_dev);

	th = dt_trans_create(env, d);
	if (IS_ERR(th)) {
	rc = PTR_ERR(th);
	goto out;
	}

	rc = llog_declare_create(env, *res, th);
	if (rc == 0) {
	rc = dt_trans_start_local(env, d, th);
	if (rc == 0)
	rc = llog_create(env, *res, th);
	}
	dt_trans_stop(env, d, th);
	out:
	if (rc)
	llog_close(env, *res);
	return rc;
	}
	EXPORT_SYMBOL(llog_open_create);

	/**
	* Helper function to delete existent llog.
	*/
	int llog_erase(const struct lu_env env, struct llog_ctxt ctxt,
	struct llog_logid logid, char name)
	{
	struct llog_handle *handle;
	int rc = 0, rc2;

	/* nothing to erase */
	if (name == NULL && logid == NULL)
	return 0;

	rc = llog_open(env, ctxt, &handle, logid, name, LLOG_OPEN_EXISTS);
	if (rc < 0)
	return rc;

	rc = llog_init_handle(env, handle, LLOG_F_IS_PLAIN, NULL);
	if (rc == 0)
	rc = llog_destroy(env, handle);

	rc2 = llog_close(env, handle);
	if (rc == 0)
	rc = rc2;
	return rc;
	}
	EXPORT_SYMBOL(llog_erase);

	/*
	* Helper function for write record in llog.
	* It hides all transaction handling from caller.
	* Valid only with local llog.
	*/
	int llog_write(const struct lu_env env, struct llog_handle loghandle,
	struct llog_rec_hdr rec, struct llog_cookie reccookie,
	int cookiecount, void *buf, int idx)
	{
	struct dt_device *dt;
	struct thandle *th;
	int rc;

	LASSERT(loghandle);
	LASSERT(loghandle->lgh_ctxt);
	LASSERT(loghandle->lgh_obj != NULL);

	dt = lu2dt_dev(loghandle->lgh_obj->do_lu.lo_dev);

	th = dt_trans_create(env, dt);
	if (IS_ERR(th))
	return PTR_ERR(th);

	rc = llog_declare_write_rec(env, loghandle, rec, idx, th);
	if (rc)
	goto out_trans;

	rc = dt_trans_start_local(env, dt, th);
	if (rc)
	goto out_trans;

	down_write(&loghandle->lgh_lock);
	rc = llog_write_rec(env, loghandle, rec, reccookie,
	cookiecount, buf, idx, th);
	up_write(&loghandle->lgh_lock);
	out_trans:
	dt_trans_stop(env, dt, th);
	return rc;
	}
	EXPORT_SYMBOL(llog_write);

	int llog_open(const struct lu_env env, struct llog_ctxt ctxt,		int llog_open(const struct lu_env env, struct llog_ctxt ctxt,
	struct llog_handle *lgh, struct llog_logid logid,		struct llog_handle *lgh, struct llog_logid logid,
	char *name, enum llog_open_param open_param)		char *name, enum llog_open_param open_param)
	@@ -902,105 +460,3 @@ out:
	return rc;		return rc;
	}		}
	EXPORT_SYMBOL(llog_close);		EXPORT_SYMBOL(llog_close);

	int llog_is_empty(const struct lu_env env, struct llog_ctxt ctxt,
	char *name)
	{
	struct llog_handle *llh;
	int rc;

	rc = llog_open(env, ctxt, &llh, NULL, name, LLOG_OPEN_EXISTS);
	if (rc < 0) {
	if (likely(rc == -ENOENT))
	rc = 0;
	goto out;
	}

	rc = llog_init_handle(env, llh, LLOG_F_IS_PLAIN, NULL);
	if (rc)
	goto out_close;
	rc = llog_get_size(llh);

	out_close:
	llog_close(env, llh);
	out:
	/* header is record 1 */
	return rc <= 1;
	}
	EXPORT_SYMBOL(llog_is_empty);

	int llog_copy_handler(const struct lu_env env, struct llog_handle llh,
	struct llog_rec_hdr rec, void data)
	{
	struct llog_handle *copy_llh = data;

	/* Append all records */
	return llog_write(env, copy_llh, rec, NULL, 0, NULL, -1);
	}
	EXPORT_SYMBOL(llog_copy_handler);

	/* backup plain llog */
	int llog_backup(const struct lu_env env, struct obd_device obd,
	struct llog_ctxt ctxt, struct llog_ctxt bctxt,
	char name, char backup)
	{
	struct llog_handle llh, bllh;
	int rc;



	/* open original log */
	rc = llog_open(env, ctxt, &llh, NULL, name, LLOG_OPEN_EXISTS);
	if (rc < 0) {
	/* the -ENOENT case is also reported to the caller
	* but silently so it should handle that if needed.
	*/
	if (rc != -ENOENT)
	CERROR("%s: failed to open log %s: rc = %d\n",
	obd->obd_name, name, rc);
	return rc;
	}

	rc = llog_init_handle(env, llh, LLOG_F_IS_PLAIN, NULL);
	if (rc)
	goto out_close;

	/* Make sure there's no old backup log */
	rc = llog_erase(env, bctxt, NULL, backup);
	if (rc < 0 && rc != -ENOENT)
	goto out_close;

	/* open backup log */
	rc = llog_open_create(env, bctxt, &bllh, NULL, backup);
	if (rc) {
	CERROR("%s: failed to open backup logfile %s: rc = %d\n",
	obd->obd_name, backup, rc);
	goto out_close;
	}

	/* check that backup llog is not the same object as original one */
	if (llh->lgh_obj == bllh->lgh_obj) {
	CERROR("%s: backup llog %s to itself (%s), objects %p/%p\n",
	obd->obd_name, name, backup, llh->lgh_obj,
	bllh->lgh_obj);
	rc = -EEXIST;
	goto out_backup;
	}

	rc = llog_init_handle(env, bllh, LLOG_F_IS_PLAIN, NULL);
	if (rc)
	goto out_backup;

	/* Copy log record by record */
	rc = llog_process_or_fork(env, llh, llog_copy_handler, (void *)bllh,
	NULL, false);
	if (rc)
	CERROR("%s: failed to backup log %s: rc = %d\n",
	obd->obd_name, name, rc);
	out_backup:
	llog_close(env, bllh);
	out_close:
	llog_close(env, llh);
	return rc;
	}
	EXPORT_SYMBOL(llog_backup);

drivers/staging/lustre/lustre/obdclass/llog_cat.c

+0 −574

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/lustre/lustre/obdclass/llog_internal.h

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,6 @@ struct llog_process_info {
	struct llog_thread_info {		struct llog_thread_info {
	struct lu_attr lgi_attr;		struct lu_attr lgi_attr;
	struct lu_fid lgi_fid;		struct lu_fid lgi_fid;
	struct dt_object_format lgi_dof;
	struct lu_buf lgi_buf;		struct lu_buf lgi_buf;
	loff_t lgi_off;		loff_t lgi_off;
	struct llog_rec_hdr lgi_lrh;		struct llog_rec_hdr lgi_lrh;
	@@ -62,15 +61,6 @@ struct llog_thread_info {

	extern struct lu_context_key llog_thread_key;		extern struct lu_context_key llog_thread_key;

	static inline struct llog_thread_info llog_info(const struct lu_env env)
	{
	struct llog_thread_info *lgi;

	lgi = lu_context_key_get(&env->le_ctx, &llog_thread_key);
	LASSERT(lgi);
	return lgi;
	}

	int llog_info_init(void);		int llog_info_init(void);
	void llog_info_fini(void);		void llog_info_fini(void);

drivers/staging/lustre/lustre/obdclass/llog_obd.c

+0 −30

Original line number	Original line	Diff line number	Diff line
	@@ -212,36 +212,6 @@ int llog_setup(const struct lu_env env, struct obd_device obd,
	}		}
	EXPORT_SYMBOL(llog_setup);		EXPORT_SYMBOL(llog_setup);

	int llog_sync(struct llog_ctxt ctxt, struct obd_export exp, int flags)
	{
	int rc = 0;

	if (!ctxt)
	return 0;

	if (CTXTP(ctxt, sync))
	rc = CTXTP(ctxt, sync)(ctxt, exp, flags);

	return rc;
	}
	EXPORT_SYMBOL(llog_sync);

	int llog_cancel(const struct lu_env env, struct llog_ctxt ctxt,
	struct llog_cookie *cookies, int flags)
	{
	int rc;

	if (!ctxt) {
	CERROR("No ctxt\n");
	return -ENODEV;
	}

	CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP);
	rc = CTXTP(ctxt, cancel)(env, ctxt, cookies, flags);
	return rc;
	}
	EXPORT_SYMBOL(llog_cancel);

	/* context key constructor/destructor: llog_key_init, llog_key_fini */		/* context key constructor/destructor: llog_key_init, llog_key_fini */
	LU_KEY_INIT_FINI(llog, struct llog_thread_info);		LU_KEY_INIT_FINI(llog, struct llog_thread_info);
	/* context key: llog_thread_key */		/* context key: llog_thread_key */

Admin message