From 49e8a922a804979e999df170cde3811e941a00f0 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin Date: Mon, 30 Mar 2015 13:21:46 +0300 Subject: [PATCH 1/1] LU-5478 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 and lustre_ioctl.h where they are replaced with __uXX and __sXX to be able to be included in userspace final patch in series. Signed-off-by: Oleg Drokin Signed-off-by: Dmitry Eremin Change-Id: I2b714ec673a004561d45ad46041191bef3ec9a8e Reviewed-on: http://review.whamcloud.com/14256 Tested-by: Jenkins Reviewed-by: John L. Hammond Tested-by: Maloo Reviewed-by: James Simmons --- lustre/include/lustre/lustre_idl.h | 15 --------------- lustre/lmv/lmv_obd.c | 4 ++-- lustre/lov/lov_io.c | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index ea61fea..eb8f6c7 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -164,21 +164,6 @@ #define LUSTRE_LOG_VERSION 0x00050000 #define LUSTRE_MGS_VERSION 0x00060000 -/* TODO: All obd_* typedefs will be removed in last patch in series */ -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. diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c index daeb893..6e99b70 100644 --- a/lustre/lmv/lmv_obd.c +++ b/lustre/lmv/lmv_obd.c @@ -2839,8 +2839,8 @@ static int lmv_get_info(const struct lu_env *env, struct obd_export *exp, * \retval negative negated errno on failure */ int lmv_set_info_async(const struct lu_env *env, struct obd_export *exp, - obd_count keylen, void *key, obd_count vallen, - void *val, struct ptlrpc_request_set *set) + __u32 keylen, void *key, __u32 vallen, void *val, + struct ptlrpc_request_set *set) { struct lmv_tgt_desc *tgt = NULL; struct obd_device *obd; diff --git a/lustre/lov/lov_io.c b/lustre/lov/lov_io.c index 0def62d..b8edb13 100644 --- a/lustre/lov/lov_io.c +++ b/lustre/lov/lov_io.c @@ -589,7 +589,7 @@ static int lov_io_read_ahead(const struct lu_env *env, struct cl_object *obj = lov2cl(loo); struct lov_layout_raid0 *r0 = lov_r0(loo); struct lov_io_sub *sub; - obd_off suboff; + loff_t suboff; pgoff_t ra_end; unsigned int pps; /* pages per stripe */ int stripe; -- 1.8.3.1