diff options
| author | Hugues Morisset <morisset.hugues@gmail.com> | 2014-09-09 16:36:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-11 14:43:46 -0700 |
| commit | fe67299757b6c16c3230c6e1ed4912a04f55b2a8 (patch) | |
| tree | f087cc1030ff6bf2c48dac3c0712ce7fab6870aa | |
| parent | 498374f7b6273920dcaf0e25a89fce9e931c986a (diff) | |
staging: lustre: fix inappropriate enums declarations.
Signed-off-by: Hugues Morisset <morisset.hugues@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/lustre/lustre/include/obd.h | 10 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/lmv/lmv_obd.c | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h index e35b7da5f412..182cc0ee15f2 100644 --- a/drivers/staging/lustre/lustre/include/obd.h +++ b/drivers/staging/lustre/lustre/include/obd.h @@ -589,13 +589,11 @@ enum placement_policy { PLACEMENT_MAX_POLICY }; -typedef enum placement_policy placement_policy_t; - struct lmv_obd { int refcount; struct lu_client_fld lmv_fld; spinlock_t lmv_lock; - placement_policy_t lmv_placement; + enum placement_policy lmv_placement; struct lmv_desc desc; struct obd_uuid cluuid; struct obd_export *exp; @@ -1086,16 +1084,14 @@ enum op_cli_flags { struct md_enqueue_info; /* metadata stat-ahead */ -typedef int (* md_enqueue_cb_t)(struct ptlrpc_request *req, - struct md_enqueue_info *minfo, - int rc); struct md_enqueue_info { struct md_op_data mi_data; struct lookup_intent mi_it; struct lustre_handle mi_lockh; struct inode *mi_dir; - md_enqueue_cb_t mi_cb; + int (*mi_cb)(struct ptlrpc_request *req, + struct md_enqueue_info *minfo, int rc); __u64 mi_cbdata; unsigned int mi_generation; }; diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c index dfb10d6cbfdf..1a5821289c39 100644 --- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c +++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c @@ -1189,7 +1189,7 @@ static int lmv_nid_policy(struct lmv_obd *lmv) } static int lmv_choose_mds(struct lmv_obd *lmv, struct md_op_data *op_data, - placement_policy_t placement) + enum placement_policy placement) { switch (placement) { case PLACEMENT_CHAR_POLICY: diff --git a/drivers/staging/lustre/lustre/lmv/lproc_lmv.c b/drivers/staging/lustre/lustre/lmv/lproc_lmv.c index a7814f12a505..117002097b28 100644 --- a/drivers/staging/lustre/lustre/lmv/lproc_lmv.c +++ b/drivers/staging/lustre/lustre/lmv/lproc_lmv.c @@ -58,7 +58,7 @@ static const char *placement_name[] = { [PLACEMENT_INVAL_POLICY] = "INVAL" }; -static placement_policy_t placement_name2policy(char *name, int len) +static enum placement_policy placement_name2policy(char *name, int len) { int i; @@ -69,7 +69,7 @@ static placement_policy_t placement_name2policy(char *name, int len) return PLACEMENT_INVAL_POLICY; } -static const char *placement_policy2name(placement_policy_t placement) +static const char *placement_policy2name(enum placement_policy placement) { LASSERT(placement < PLACEMENT_MAX_POLICY); return placement_name[placement]; @@ -94,7 +94,7 @@ static ssize_t lmv_placement_seq_write(struct file *file, struct obd_device *dev = ((struct seq_file *)file->private_data)->private; char dummy[MAX_POLICY_STRING_SIZE + 1]; int len = count; - placement_policy_t policy; + enum placement_policy policy; struct lmv_obd *lmv; if (copy_from_user(dummy, buffer, MAX_POLICY_STRING_SIZE)) |