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

Commit b5367061 authored by wang di's avatar wang di Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llog: record the minimum record size 



The minimum record size will be recorded in llh_size, which is
only used by fixed size record llog now, and also add another
flag LLOG_F_IS_FIXSIZE to indicate the fix size record llog.

Signed-off-by: default avatarwang di <di.wang@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7050
Reviewed-on: http://review.whamcloud.com/16103


Reviewed-by: default avatarMike Pershin <mike.pershin@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f906a246

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

+7 −0
Original line number Diff line number Diff line
@@ -3020,7 +3020,14 @@ enum llog_flag { 
	LLOG_F_IS_CAT		= 0x2,

	LLOG_F_IS_PLAIN		= 0x4,

	LLOG_F_EXT_JOBID        = BIT(3),

	LLOG_F_IS_FIXSIZE	= BIT(4),



	/*

	 * Note: Flags covered by LLOG_F_EXT_MASK will be inherited from

	 * catlog to plain log, so do not add LLOG_F_IS_FIXSIZE here,

	 * because the catlog record is usually fixed size, but its plain

	 * log record can be variable

	 */

	LLOG_F_EXT_MASK = LLOG_F_EXT_JOBID,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ int llog_init_handle(const struct lu_env *env, struct llog_handle *handle, 
		LASSERT(list_empty(&handle->u.chd.chd_head));

		INIT_LIST_HEAD(&handle->u.chd.chd_head);

		llh->llh_size = sizeof(struct llog_logid_rec);

		llh->llh_flags |= LLOG_F_IS_FIXSIZE;

	} else if (!(flags & LLOG_F_IS_PLAIN)) {

		CERROR("%s: unknown flags: %#x (expected %#x or %#x)\n",

		       handle->lgh_ctxt->loc_obd->obd_name,