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

Commit 21aef7d9 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: get rid of obd_* typedefs 



We have a bunch of typedefs for common things that made no sense
and hid the actual type from plain view.
Replace them with proper uXX or sXX types.
Exception is in lustre_idl.h where
they are replaced with __uXX and __sXX to be able to be included
in userspace

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

drivers/staging/lustre/lustre/include/cl_object.h

+2 −2
Original line number Diff line number Diff line
@@ -2508,7 +2508,7 @@ struct cl_req_operations { 
	void (*cro_attr_set)(const struct lu_env *env,

			     const struct cl_req_slice *slice,

			     const struct cl_object *obj,

			     struct cl_req_attr *attr, obd_valid flags);

			     struct cl_req_attr *attr, u64 flags);

	/**

	 * Called top-to-bottom from cl_req_completion() to notify layers that

	 * transfer completed. Has to free all state allocated by
@@ -3182,7 +3182,7 @@ void cl_req_page_add (const struct lu_env *env, struct cl_req *req, 
void cl_req_page_done (const struct lu_env *env, struct cl_page *page);

int  cl_req_prep      (const struct lu_env *env, struct cl_req *req);

void cl_req_attr_set  (const struct lu_env *env, struct cl_req *req,

		       struct cl_req_attr *attr, obd_valid flags);

		       struct cl_req_attr *attr, u64 flags);

void cl_req_completion(const struct lu_env *env, struct cl_req *req, int ioret);



/** \defgroup cl_sync_io cl_sync_io

drivers/staging/lustre/lustre/include/lclient.h

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ void ccc_req_completion(const struct lu_env *env, 
			const struct cl_req_slice *slice, int ioret);

void ccc_req_attr_set(const struct lu_env *env,const struct cl_req_slice *slice,

		      const struct cl_object *obj,

		      struct cl_req_attr *oa, obd_valid flags);

		      struct cl_req_attr *oa, u64 flags);



struct lu_device   *ccc2lu_dev      (struct ccc_device *vdv);

struct lu_object   *ccc2lu	  (struct ccc_object *vob);

drivers/staging/lustre/lustre/include/linux/obd_class.h

+3 −3
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ 


/* obdo.c */

void obdo_from_la(struct obdo *dst, struct lu_attr *la, __u64 valid);

void la_from_obdo(struct lu_attr *la, struct obdo *dst, obd_flag valid);

void obdo_refresh_inode(struct inode *dst, struct obdo *src, obd_flag valid);

void obdo_to_inode(struct inode *dst, struct obdo *src, obd_flag valid);

void la_from_obdo(struct lu_attr *la, struct obdo *dst, u32 valid);

void obdo_refresh_inode(struct inode *dst, struct obdo *src, u32 valid);

void obdo_to_inode(struct inode *dst, struct obdo *src, u32 valid);

#define ll_inode_flags(inode)	 (inode->i_flags)

drivers/staging/lustre/lustre/include/lu_object.h

+3 −3
Original line number Diff line number Diff line
@@ -404,11 +404,11 @@ struct lu_attr { 
	/** size in bytes */

	__u64	  la_size;

	/** modification time in seconds since Epoch */

	obd_time       la_mtime;

	s64	  la_mtime;

	/** access time in seconds since Epoch */

	obd_time       la_atime;

	s64	  la_atime;

	/** change time in seconds since Epoch */

	obd_time       la_ctime;

	s64	  la_ctime;

	/** 512-byte blocks allocated to object */

	__u64	  la_blocks;

	/** permission bits and file type */

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

+54 −68
Original line number Diff line number Diff line
@@ -165,20 +165,6 @@ 
#define LUSTRE_LOG_VERSION  0x00050000

#define LUSTRE_MGS_VERSION  0x00060000



typedef __u64 obd_id;

typedef __u64 obd_seq;

typedef __s64 obd_time;

typedef __u64 obd_size;

typedef __u64 obd_off;

typedef __u64 obd_blocks;

typedef __u64 obd_valid;

typedef __u32 obd_blksize;

typedef __u32 obd_mode;

typedef __u32 obd_uid;

typedef __u32 obd_gid;

typedef __u32 obd_flag;

typedef __u32 obd_count;



/**

 * Describes a range of sequence, lsr_start is included but lsr_end is

 * not in the range.
@@ -411,7 +397,7 @@ static inline void fid_zero(struct lu_fid *fid) 
	memset(fid, 0, sizeof(*fid));

}



static inline obd_id fid_ver_oid(const struct lu_fid *fid)

static inline __u64 fid_ver_oid(const struct lu_fid *fid)

{

	return ((__u64)fid_ver(fid) << 32 | fid_oid(fid));

}
@@ -475,7 +461,7 @@ enum dot_lustre_oid { 
	FID_OID_DOT_LUSTRE_OBF = 2UL,

};



static inline int fid_seq_is_mdt0(obd_seq seq)

static inline int fid_seq_is_mdt0(__u64 seq)

{

	return (seq == FID_SEQ_OST_MDT0);

}
@@ -485,7 +471,7 @@ static inline int fid_seq_is_mdt(const __u64 seq) 
	return seq == FID_SEQ_OST_MDT0 || seq >= FID_SEQ_NORMAL;

};



static inline int fid_seq_is_echo(obd_seq seq)

static inline int fid_seq_is_echo(__u64 seq)

{

	return (seq == FID_SEQ_ECHO);

}
@@ -495,7 +481,7 @@ static inline int fid_is_echo(const struct lu_fid *fid) 
	return fid_seq_is_echo(fid_seq(fid));

}



static inline int fid_seq_is_llog(obd_seq seq)

static inline int fid_seq_is_llog(__u64 seq)

{

	return (seq == FID_SEQ_LLOG);

}
@@ -595,13 +581,13 @@ static inline int fid_is_norm(const struct lu_fid *fid) 
}



/* convert an OST objid into an IDIF FID SEQ number */

static inline obd_seq fid_idif_seq(obd_id id, __u32 ost_idx)

static inline __u64 fid_idif_seq(__u64 id, __u32 ost_idx)

{

	return FID_SEQ_IDIF | (ost_idx << 16) | ((id >> 32) & 0xffff);

}



/* convert a packed IDIF FID into an OST objid */

static inline obd_id fid_idif_id(obd_seq seq, __u32 oid, __u32 ver)

static inline __u64 fid_idif_id(__u64 seq, __u32 oid, __u32 ver)

{

	return ((__u64)ver << 48) | ((seq & 0xffff) << 32) | oid;

}
@@ -613,7 +599,7 @@ static inline __u32 fid_idif_ost_idx(const struct lu_fid *fid) 
}



/* extract OST sequence (group) from a wire ost_id (id/seq) pair */

static inline obd_seq ostid_seq(const struct ost_id *ostid)

static inline __u64 ostid_seq(const struct ost_id *ostid)

{

	if (fid_seq_is_mdt0(ostid->oi.oi_seq))

		return FID_SEQ_OST_MDT0;
@@ -628,7 +614,7 @@ static inline obd_seq ostid_seq(const struct ost_id *ostid) 
}



/* extract OST objid from a wire ost_id (id/seq) pair */

static inline obd_id ostid_id(const struct ost_id *ostid)

static inline __u64 ostid_id(const struct ost_id *ostid)

{

	if (fid_seq_is_mdt0(ostid_seq(ostid)))

		return ostid->oi.oi_id & IDIF_OID_MASK;
@@ -1855,9 +1841,9 @@ extern void lustre_swab_niobuf_remote (struct niobuf_remote *nbr); 


struct ost_lvb_v1 {

	__u64		lvb_size;

	obd_time	lvb_mtime;

	obd_time	lvb_atime;

	obd_time	lvb_ctime;

	__s64		lvb_mtime;

	__s64		lvb_atime;

	__s64		lvb_ctime;

	__u64		lvb_blocks;

};
@@ -1865,9 +1851,9 @@ extern void lustre_swab_ost_lvb_v1(struct ost_lvb_v1 *lvb); 


struct ost_lvb {

	__u64		lvb_size;

	obd_time	lvb_mtime;

	obd_time	lvb_atime;

	obd_time	lvb_ctime;

	__s64		lvb_mtime;

	__s64		lvb_atime;

	__s64		lvb_ctime;

	__u64		lvb_blocks;

	__u32		lvb_mtime_ns;

	__u32		lvb_atime_ns;
@@ -2248,9 +2234,9 @@ struct mdt_body { 
	struct lustre_handle handle;

	__u64	  valid;

	__u64	  size;   /* Offset, in the case of MDS_READPAGE */

       obd_time	mtime;

       obd_time	atime;

       obd_time	ctime;

	__s64	  mtime;

	__s64	  atime;

	__s64	  ctime;

	__u64	  blocks; /* XID, in the case of MDS_READPAGE */

	__u64	  ioepoch;

	__u64	       t_state; /* transient file state defined in
@@ -2333,9 +2319,9 @@ struct mdt_rec_setattr { 
	__u32	   sa_gid;

	__u64	   sa_size;

	__u64	   sa_blocks;

	obd_time	sa_mtime;

	obd_time	sa_atime;

	obd_time	sa_ctime;

	__s64	   sa_mtime;

	__s64	   sa_atime;

	__s64	   sa_ctime;

	__u32	   sa_attr_flags;

	__u32	   sa_mode;

	__u32	   sa_bias;      /* some operation flags */
@@ -2464,7 +2450,7 @@ struct mdt_rec_create { 
	struct lu_fid   cr_fid1;

	struct lu_fid   cr_fid2;

	struct lustre_handle cr_old_handle; /* handle in case of open replay */

	obd_time	cr_time;

	__s64	   cr_time;

	__u64	   cr_rdev;

	__u64	   cr_ioepoch;

	__u64	   cr_padding_1;   /* rr_blocks */
@@ -2504,7 +2490,7 @@ struct mdt_rec_link { 
	__u32	   lk_suppgid2_h;

	struct lu_fid   lk_fid1;

	struct lu_fid   lk_fid2;

	obd_time	lk_time;

	__s64	   lk_time;

	__u64	   lk_padding_1;   /* rr_atime */

	__u64	   lk_padding_2;   /* rr_ctime */

	__u64	   lk_padding_3;   /* rr_size */
@@ -2531,7 +2517,7 @@ struct mdt_rec_unlink { 
	__u32	   ul_suppgid2_h;

	struct lu_fid   ul_fid1;

	struct lu_fid   ul_fid2;

	obd_time	ul_time;

	__s64	   ul_time;

	__u64	   ul_padding_2;   /* rr_atime */

	__u64	   ul_padding_3;   /* rr_ctime */

	__u64	   ul_padding_4;   /* rr_size */
@@ -2558,7 +2544,7 @@ struct mdt_rec_rename { 
	__u32	   rn_suppgid2_h;

	struct lu_fid   rn_fid1;

	struct lu_fid   rn_fid2;

	obd_time	rn_time;

	__s64	   rn_time;

	__u64	   rn_padding_1;   /* rr_atime */

	__u64	   rn_padding_2;   /* rr_ctime */

	__u64	   rn_padding_3;   /* rr_size */
@@ -2588,7 +2574,7 @@ struct mdt_rec_setxattr { 
	__u32	   sx_padding_2;

	__u32	   sx_padding_3;

	__u64	   sx_valid;

	obd_time	sx_time;

	__s64	   sx_time;

	__u64	   sx_padding_5;   /* rr_ctime */

	__u64	   sx_padding_6;   /* rr_size */

	__u64	   sx_padding_7;   /* rr_blocks */
@@ -2621,9 +2607,9 @@ struct mdt_rec_reint { 
	__u32	   rr_suppgid2_h;

	struct lu_fid   rr_fid1;

	struct lu_fid   rr_fid2;

	obd_time	rr_mtime;

	obd_time	rr_atime;

	obd_time	rr_ctime;

	__s64	   rr_mtime;

	__s64	   rr_atime;

	__s64	   rr_ctime;

	__u64	   rr_size;

	__u64	   rr_blocks;

	__u32	   rr_bias;
@@ -2977,8 +2963,8 @@ struct cfg_marker { 
	__u32	     cm_flags;

	__u32	     cm_vers;       /* lustre release version number */

	__u32	     cm_padding;    /* 64 bit align */

	obd_time	  cm_createtime; /*when this record was first created */

	obd_time	  cm_canceltime; /*when this record is no longer valid*/

	__s64	     cm_createtime; /*when this record was first created */

	__s64	     cm_canceltime; /*when this record is no longer valid*/

	char	      cm_tgtname[MTI_NAME_MAXLEN];

	char	      cm_comment[MTI_NAME_MAXLEN];

};
@@ -3082,16 +3068,16 @@ struct llog_logid_rec { 


struct llog_unlink_rec {

	struct llog_rec_hdr	lur_hdr;

	obd_id			lur_oid;

	obd_count		lur_oseq;

	obd_count		lur_count;

	__u64			lur_oid;

	__u32			lur_oseq;

	__u32			lur_count;

	struct llog_rec_tail	lur_tail;

} __attribute__((packed));



struct llog_unlink64_rec {

	struct llog_rec_hdr	lur_hdr;

	struct lu_fid		lur_fid;

	obd_count		lur_count; /* to destroy the lost precreated */

	__u32			lur_count; /* to destroy the lost precreated */

	__u32			lur_padding1;

	__u64			lur_padding2;

	__u64			lur_padding3;
@@ -3236,7 +3222,7 @@ enum llog_flag { 


struct llog_log_hdr {

	struct llog_rec_hdr     llh_hdr;

	obd_time		llh_timestamp;

	__s64		   llh_timestamp;

	__u32		   llh_count;

	__u32		   llh_bitmap_offset;

	__u32		   llh_size;
@@ -3294,25 +3280,25 @@ struct llogd_conn_body { 


/* Note: 64-bit types are 64-bit aligned in structure */

struct obdo {

	obd_valid	       o_valid;	/* hot fields in this obdo */

	__u64		o_valid;	/* hot fields in this obdo */

	struct ost_id	o_oi;

	obd_id		  o_parent_seq;

	obd_size		o_size;	 /* o_size-o_blocks == ost_lvb */

	obd_time		o_mtime;

	obd_time		o_atime;

	obd_time		o_ctime;

	obd_blocks	      o_blocks;       /* brw: cli sent cached bytes */

	obd_size		o_grant;

	__u64		o_parent_seq;

	__u64		o_size;	 /* o_size-o_blocks == ost_lvb */

	__s64		o_mtime;

	__s64		o_atime;

	__s64		o_ctime;

	__u64		o_blocks;       /* brw: cli sent cached bytes */

	__u64		o_grant;



	/* 32-bit fields start here: keep an even number of them via padding */

	obd_blksize	     o_blksize;      /* optimal IO blocksize */

	obd_mode		o_mode;	 /* brw: cli sent cache remain */

	obd_uid		 o_uid;

	obd_gid		 o_gid;

	obd_flag		o_flags;

	obd_count	       o_nlink;	/* brw: checksum */

	obd_count	       o_parent_oid;

	obd_count		o_misc;		/* brw: o_dropped */

	__u32		o_blksize;      /* optimal IO blocksize */

	__u32		o_mode;	 /* brw: cli sent cache remain */

	__u32		o_uid;

	__u32		o_gid;

	__u32		o_flags;

	__u32		o_nlink;	/* brw: checksum */

	__u32		o_parent_oid;

	__u32		o_misc;		/* brw: o_dropped */



	__u64		   o_ioepoch;      /* epoch in ost writes */

	__u32		   o_stripe_idx;   /* holds stripe idx */
@@ -3361,7 +3347,7 @@ static inline void lustre_get_wire_obdo(struct obd_connect_data *ocd, 
					struct obdo *lobdo,

					const struct obdo *wobdo)

{

	obd_flag local_flags = 0;

	__u32 local_flags = 0;



	if (lobdo->o_valid & OBD_MD_FLFLAGS)

		 local_flags = lobdo->o_flags & OBD_FL_LOCAL_MASK;
@@ -3399,7 +3385,7 @@ struct ll_fiemap_info_key { 
};



extern void lustre_swab_ost_body (struct ost_body *b);

extern void lustre_swab_ost_last_id(obd_id *id);

extern void lustre_swab_ost_last_id(__u64 *id);

extern void lustre_swab_fiemap(struct ll_user_fiemap *fiemap);



extern void lustre_swab_lov_user_md_v1(struct lov_user_md_v1 *lum);