Commit 805e517a authored by Emil Goode's avatar Emil Goode Committed by Greg Kroah-Hartman

staging: lustre: Fix sparse warnings about use of obsolete initializer

This patch fixes a lot of sparse warnings about use of obsolete
struct and array initializer.
Signed-off-by: default avatarEmil Goode <emilgoode@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7d46a21a
...@@ -762,14 +762,14 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) ...@@ -762,14 +762,14 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
EXPORT_SYMBOL(target_send_reply); EXPORT_SYMBOL(target_send_reply);
ldlm_mode_t lck_compat_array[] = { ldlm_mode_t lck_compat_array[] = {
[LCK_EX] LCK_COMPAT_EX, [LCK_EX] = LCK_COMPAT_EX,
[LCK_PW] LCK_COMPAT_PW, [LCK_PW] = LCK_COMPAT_PW,
[LCK_PR] LCK_COMPAT_PR, [LCK_PR] = LCK_COMPAT_PR,
[LCK_CW] LCK_COMPAT_CW, [LCK_CW] = LCK_COMPAT_CW,
[LCK_CR] LCK_COMPAT_CR, [LCK_CR] = LCK_COMPAT_CR,
[LCK_NL] LCK_COMPAT_NL, [LCK_NL] = LCK_COMPAT_NL,
[LCK_GROUP] LCK_COMPAT_GROUP, [LCK_GROUP] = LCK_COMPAT_GROUP,
[LCK_COS] LCK_COMPAT_COS, [LCK_COS] = LCK_COMPAT_COS,
}; };
/** /**
......
...@@ -49,45 +49,45 @@ ...@@ -49,45 +49,45 @@
/* lock types */ /* lock types */
char *ldlm_lockname[] = { char *ldlm_lockname[] = {
[0] "--", [0] = "--",
[LCK_EX] "EX", [LCK_EX] = "EX",
[LCK_PW] "PW", [LCK_PW] = "PW",
[LCK_PR] "PR", [LCK_PR] = "PR",
[LCK_CW] "CW", [LCK_CW] = "CW",
[LCK_CR] "CR", [LCK_CR] = "CR",
[LCK_NL] "NL", [LCK_NL] = "NL",
[LCK_GROUP] "GROUP", [LCK_GROUP] = "GROUP",
[LCK_COS] "COS" [LCK_COS] = "COS",
}; };
EXPORT_SYMBOL(ldlm_lockname); EXPORT_SYMBOL(ldlm_lockname);
char *ldlm_typename[] = { char *ldlm_typename[] = {
[LDLM_PLAIN] "PLN", [LDLM_PLAIN] = "PLN",
[LDLM_EXTENT] "EXT", [LDLM_EXTENT] = "EXT",
[LDLM_FLOCK] "FLK", [LDLM_FLOCK] = "FLK",
[LDLM_IBITS] "IBT", [LDLM_IBITS] = "IBT",
}; };
EXPORT_SYMBOL(ldlm_typename); EXPORT_SYMBOL(ldlm_typename);
static ldlm_policy_wire_to_local_t ldlm_policy_wire18_to_local[] = { static ldlm_policy_wire_to_local_t ldlm_policy_wire18_to_local[] = {
[LDLM_PLAIN - LDLM_MIN_TYPE] ldlm_plain_policy_wire_to_local, [LDLM_PLAIN - LDLM_MIN_TYPE] = ldlm_plain_policy_wire_to_local,
[LDLM_EXTENT - LDLM_MIN_TYPE] ldlm_extent_policy_wire_to_local, [LDLM_EXTENT - LDLM_MIN_TYPE] = ldlm_extent_policy_wire_to_local,
[LDLM_FLOCK - LDLM_MIN_TYPE] ldlm_flock_policy_wire18_to_local, [LDLM_FLOCK - LDLM_MIN_TYPE] = ldlm_flock_policy_wire18_to_local,
[LDLM_IBITS - LDLM_MIN_TYPE] ldlm_ibits_policy_wire_to_local, [LDLM_IBITS - LDLM_MIN_TYPE] = ldlm_ibits_policy_wire_to_local,
}; };
static ldlm_policy_wire_to_local_t ldlm_policy_wire21_to_local[] = { static ldlm_policy_wire_to_local_t ldlm_policy_wire21_to_local[] = {
[LDLM_PLAIN - LDLM_MIN_TYPE] ldlm_plain_policy_wire_to_local, [LDLM_PLAIN - LDLM_MIN_TYPE] = ldlm_plain_policy_wire_to_local,
[LDLM_EXTENT - LDLM_MIN_TYPE] ldlm_extent_policy_wire_to_local, [LDLM_EXTENT - LDLM_MIN_TYPE] = ldlm_extent_policy_wire_to_local,
[LDLM_FLOCK - LDLM_MIN_TYPE] ldlm_flock_policy_wire21_to_local, [LDLM_FLOCK - LDLM_MIN_TYPE] = ldlm_flock_policy_wire21_to_local,
[LDLM_IBITS - LDLM_MIN_TYPE] ldlm_ibits_policy_wire_to_local, [LDLM_IBITS - LDLM_MIN_TYPE] = ldlm_ibits_policy_wire_to_local,
}; };
static ldlm_policy_local_to_wire_t ldlm_policy_local_to_wire[] = { static ldlm_policy_local_to_wire_t ldlm_policy_local_to_wire[] = {
[LDLM_PLAIN - LDLM_MIN_TYPE] ldlm_plain_policy_local_to_wire, [LDLM_PLAIN - LDLM_MIN_TYPE] = ldlm_plain_policy_local_to_wire,
[LDLM_EXTENT - LDLM_MIN_TYPE] ldlm_extent_policy_local_to_wire, [LDLM_EXTENT - LDLM_MIN_TYPE] = ldlm_extent_policy_local_to_wire,
[LDLM_FLOCK - LDLM_MIN_TYPE] ldlm_flock_policy_local_to_wire, [LDLM_FLOCK - LDLM_MIN_TYPE] = ldlm_flock_policy_local_to_wire,
[LDLM_IBITS - LDLM_MIN_TYPE] ldlm_ibits_policy_local_to_wire, [LDLM_IBITS - LDLM_MIN_TYPE] = ldlm_ibits_policy_local_to_wire,
}; };
/** /**
......
...@@ -2068,7 +2068,10 @@ void ldlm_namespace_foreach(struct ldlm_namespace *ns, ...@@ -2068,7 +2068,10 @@ void ldlm_namespace_foreach(struct ldlm_namespace *ns,
ldlm_iterator_t iter, void *closure) ldlm_iterator_t iter, void *closure)
{ {
struct iter_helper_data helper = { iter: iter, closure: closure }; struct iter_helper_data helper = {
.iter = iter,
.closure = closure,
};
cfs_hash_for_each_nolock(ns->ns_rs_hash, cfs_hash_for_each_nolock(ns->ns_rs_hash,
ldlm_res_iter_helper, &helper); ldlm_res_iter_helper, &helper);
......
...@@ -194,9 +194,9 @@ static int panic_notifier(struct notifier_block *self, unsigned long unused1, ...@@ -194,9 +194,9 @@ static int panic_notifier(struct notifier_block *self, unsigned long unused1,
} }
static struct notifier_block libcfs_panic_notifier = { static struct notifier_block libcfs_panic_notifier = {
notifier_call : panic_notifier, .notifier_call = panic_notifier,
next : NULL, .next = NULL,
priority : 10000 .priority = 10000,
}; };
void libcfs_register_panic_notifier(void) void libcfs_register_panic_notifier(void)
......
...@@ -171,9 +171,9 @@ static long libcfs_ioctl(struct file *file, ...@@ -171,9 +171,9 @@ static long libcfs_ioctl(struct file *file,
} }
static struct file_operations libcfs_fops = { static struct file_operations libcfs_fops = {
unlocked_ioctl: libcfs_ioctl, .unlocked_ioctl = libcfs_ioctl,
open : libcfs_psdev_open, .open = libcfs_psdev_open,
release : libcfs_psdev_release .release = libcfs_psdev_release,
}; };
struct miscdevice libcfs_dev = { struct miscdevice libcfs_dev = {
......
...@@ -2378,7 +2378,7 @@ static int mdc_resource_inode_free(struct ldlm_resource *res) ...@@ -2378,7 +2378,7 @@ static int mdc_resource_inode_free(struct ldlm_resource *res)
} }
struct ldlm_valblock_ops inode_lvbo = { struct ldlm_valblock_ops inode_lvbo = {
lvbo_free: mdc_resource_inode_free .lvbo_free = mdc_resource_inode_free,
}; };
static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg) static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment