Commit 1b256126 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: remove unused som_attrs and hsm_attrs structures 



These structures are only used server-side to parse relevant
attributes.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf21a6be

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

+0 −37
Original line number Diff line number Diff line
@@ -321,43 +321,6 @@ enum lma_incompat { 
};

#define LMA_INCOMPAT_SUPP	(LMAI_AGENT | LMAI_REMOTE_PARENT)



/**

 * SOM on-disk attributes stored in a separate xattr.

 */

struct som_attrs {

	/** Bitfield for supported data in this structure. For future use. */

	__u32	som_compat;



	/** Incompat feature list. The supported feature mask is available in

	 * SOM_INCOMPAT_SUPP */

	__u32	som_incompat;



	/** IO Epoch SOM attributes belongs to */

	__u64	som_ioepoch;

	/** total file size in objects */

	__u64	som_size;

	/** total fs blocks in objects */

	__u64	som_blocks;

	/** mds mount id the size is valid for */

	__u64	som_mountid;

};

#define SOM_INCOMPAT_SUPP 0x0



/**

 * HSM on-disk attributes stored in a separate xattr.

 */

struct hsm_attrs {

	/** Bitfield for supported data in this structure. For future use. */

	__u32	hsm_compat;



	/** HSM flags, see hsm_flags enum below */

	__u32	hsm_flags;

	/** backend archive id associated with the file */

	__u64	hsm_arch_id;

	/** version associated with the last archiving, if any */

	__u64	hsm_arch_ver;

};



/**

 * fid constants

 */

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

+0 −48
Original line number Diff line number Diff line
@@ -460,54 +460,6 @@ void lustre_assert_wire_constants(void) 
	LASSERTF(OBJ_INDEX_DELETE == 11, "found %lld\n",

		 (long long)OBJ_INDEX_DELETE);



	/* Checks for struct som_attrs */

	LASSERTF((int)sizeof(struct som_attrs) == 40, "found %lld\n",

		 (long long)(int)sizeof(struct som_attrs));

	LASSERTF((int)offsetof(struct som_attrs, som_compat) == 0, "found %lld\n",

		 (long long)(int)offsetof(struct som_attrs, som_compat));

	LASSERTF((int)sizeof(((struct som_attrs *)0)->som_compat) == 4, "found %lld\n",

		 (long long)(int)sizeof(((struct som_attrs *)0)->som_compat));

	LASSERTF((int)offsetof(struct som_attrs, som_incompat) == 4, "found %lld\n",

		 (long long)(int)offsetof(struct som_attrs, som_incompat));

	LASSERTF((int)sizeof(((struct som_attrs *)0)->som_incompat) == 4, "found %lld\n",

		 (long long)(int)sizeof(((struct som_attrs *)0)->som_incompat));

	LASSERTF((int)offsetof(struct som_attrs, som_ioepoch) == 8, "found %lld\n",

		 (long long)(int)offsetof(struct som_attrs, som_ioepoch));

	LASSERTF((int)sizeof(((struct som_attrs *)0)->som_ioepoch) == 8, "found %lld\n",

		 (long long)(int)sizeof(((struct som_attrs *)0)->som_ioepoch));

	LASSERTF((int)offsetof(struct som_attrs, som_size) == 16, "found %lld\n",

		 (long long)(int)offsetof(struct som_attrs, som_size));

	LASSERTF((int)sizeof(((struct som_attrs *)0)->som_size) == 8, "found %lld\n",

		 (long long)(int)sizeof(((struct som_attrs *)0)->som_size));

	LASSERTF((int)offsetof(struct som_attrs, som_blocks) == 24, "found %lld\n",

		 (long long)(int)offsetof(struct som_attrs, som_blocks));

	LASSERTF((int)sizeof(((struct som_attrs *)0)->som_blocks) == 8, "found %lld\n",

		 (long long)(int)sizeof(((struct som_attrs *)0)->som_blocks));

	LASSERTF((int)offsetof(struct som_attrs, som_mountid) == 32, "found %lld\n",

		 (long long)(int)offsetof(struct som_attrs, som_mountid));

	LASSERTF((int)sizeof(((struct som_attrs *)0)->som_mountid) == 8, "found %lld\n",

		 (long long)(int)sizeof(((struct som_attrs *)0)->som_mountid));



	/* Checks for struct hsm_attrs */

	LASSERTF((int)sizeof(struct hsm_attrs) == 24, "found %lld\n",

		 (long long)(int)sizeof(struct hsm_attrs));

	LASSERTF((int)offsetof(struct hsm_attrs, hsm_compat) == 0, "found %lld\n",

		 (long long)(int)offsetof(struct hsm_attrs, hsm_compat));

	LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_compat) == 4, "found %lld\n",

		 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_compat));

	LASSERTF((int)offsetof(struct hsm_attrs, hsm_flags) == 4, "found %lld\n",

		 (long long)(int)offsetof(struct hsm_attrs, hsm_flags));

	LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_flags) == 4, "found %lld\n",

		 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_flags));

	LASSERTF((int)offsetof(struct hsm_attrs, hsm_arch_id) == 8, "found %lld\n",

		 (long long)(int)offsetof(struct hsm_attrs, hsm_arch_id));

	LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_arch_id) == 8, "found %lld\n",

		 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_arch_id));

	LASSERTF((int)offsetof(struct hsm_attrs, hsm_arch_ver) == 16, "found %lld\n",

		 (long long)(int)offsetof(struct hsm_attrs, hsm_arch_ver));

	LASSERTF((int)sizeof(((struct hsm_attrs *)0)->hsm_arch_ver) == 8, "found %lld\n",

		 (long long)(int)sizeof(((struct hsm_attrs *)0)->hsm_arch_ver));



	/* Checks for struct ost_id */

	LASSERTF((int)sizeof(struct ost_id) == 16, "found %lld\n",

		 (long long)(int)sizeof(struct ost_id));