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

Commit c0ac76d9 authored by Fan Yong's avatar Fan Yong Committed by Greg Kroah-Hartman
Browse files

staging/lustre/scrub: OI scrub on OST 

Main part of original patch in Lustre tree
(http://review.whamcloud.com/6669) changes server code and
is unneeded by client. The patch only picks up common
functions and data structures change.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3335
Lustre-change: http://review.whamcloud.com/6669


Signed-off-by: default avatarFan Yong <fan.yong@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarAlex Zhuravlev <alexey.zhuravlev@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 211b3168

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

+5 −2
Original line number Diff line number Diff line
@@ -323,6 +323,9 @@ static inline int range_compare_loc(const struct lu_seq_range *r1, 
enum lma_compat {

	LMAC_HSM	= 0x00000001,

	LMAC_SOM	= 0x00000002,

	LMAC_NOT_IN_OI	= 0x00000004, /* the object does NOT need OI mapping */

	LMAC_FID_ON_OST = 0x00000008, /* For OST-object, its OI mapping is

				       * under /O/<seq>/d<x>. */

};



/**

drivers/staging/lustre/lustre/include/obd_support.h

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, 
#define OBD_FAIL_OSD_SCRUB_FATAL			0x192

#define OBD_FAIL_OSD_FID_MAPPING			0x193

#define OBD_FAIL_OSD_LMA_INCOMPAT			0x194

#define OBD_FAIL_OSD_COMPAT_INVALID_ENTRY		0x195



#define OBD_FAIL_OST		     0x200

#define OBD_FAIL_OST_CONNECT_NET	 0x201

drivers/staging/lustre/lustre/ptlrpc/wiretest.c

+4 −0
Original line number Diff line number Diff line
@@ -431,6 +431,10 @@ void lustre_assert_wire_constants(void) 
		(unsigned)LMAC_HSM);

	LASSERTF(LMAC_SOM == 0x00000002UL, "found 0x%.8xUL\n",

		(unsigned)LMAC_SOM);

	LASSERTF(LMAC_NOT_IN_OI == 0x00000004UL, "found 0x%.8xUL\n",

		(unsigned)LMAC_NOT_IN_OI);

	LASSERTF(LMAC_FID_ON_OST == 0x00000008UL, "found 0x%.8xUL\n",

		(unsigned)LMAC_FID_ON_OST);

	LASSERTF(OBJ_CREATE == 1, "found %lld\n",

		 (long long)OBJ_CREATE);

	LASSERTF(OBJ_DESTROY == 2, "found %lld\n",