From 84c17d988c287619e356921f60e4033fa80cd9cd Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 17 Jan 2011 14:34:55 -0800 Subject: [PATCH] datapath: Consistently parenthesize the operand of 'sizeof'. This is proper kernel style. Kernel style also encourages using a type name instead of an expression as sizeof's operand, but this patch doesn't make any of those changes. Signed-off-by: Ben Pfaff Acked-by: Jesse Gross --- datapath/brc_procfs.c | 4 ++-- datapath/datapath.c | 42 +++++++++++++++++++++--------------------- datapath/flow.c | 8 ++++---- datapath/table.c | 4 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/datapath/brc_procfs.c b/datapath/brc_procfs.c index bf328c9b8..6bcb51c24 100644 --- a/datapath/brc_procfs.c +++ b/datapath/brc_procfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011 Nicira Networks. * Distributed under the terms of the GNU GPL version 2. * * Significant portions of this file may be copied from parts of the Linux @@ -171,7 +171,7 @@ static void kill_proc_dir(const char *dir_name, if (!e) break; - if (e->namelen >= sizeof name) { + if (e->namelen >= sizeof(name)) { /* Can't happen: we prevent adding names this long by * limiting the BRC_GENL_A_PROC_NAME string to * BRC_NAME_LEN_MAX bytes. */ diff --git a/datapath/datapath.c b/datapath/datapath.c index f9af82998..5e64cfb69 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -223,7 +223,7 @@ static int create_dp(int dp_idx, const char __user *devnamep) goto err; } } else { - snprintf(devname, sizeof devname, "of%d", dp_idx); + snprintf(devname, sizeof(devname), "of%d", dp_idx); } rtnl_lock(); @@ -240,7 +240,7 @@ static int create_dp(int dp_idx, const char __user *devnamep) goto err_put_module; err = -ENOMEM; - dp = kzalloc(sizeof *dp, GFP_KERNEL); + dp = kzalloc(sizeof(*dp), GFP_KERNEL); if (dp == NULL) goto err_put_module; INIT_LIST_HEAD(&dp->port_list); @@ -389,7 +389,7 @@ static int attach_port(int dp_idx, struct odp_port __user *portp) int err; err = -EFAULT; - if (copy_from_user(&port, portp, sizeof port)) + if (copy_from_user(&port, portp, sizeof(port))) goto out; port.devname[IFNAMSIZ - 1] = '\0'; port.type[VPORT_TYPE_SIZE - 1] = '\0'; @@ -582,11 +582,11 @@ static int queue_control_packets(struct sk_buff *skb, struct sk_buff_head *queue nskb = skb->next; skb->next = NULL; - err = skb_cow(skb, sizeof *header); + err = skb_cow(skb, sizeof(*header)); if (err) goto err_kfree_skbs; - header = (struct odp_msg*)__skb_push(skb, sizeof *header); + header = (struct odp_msg*)__skb_push(skb, sizeof(*header)); header->type = queue_no; header->length = skb->len; header->port = port_no; @@ -1009,7 +1009,7 @@ static int del_flow(struct datapath *dp, struct odp_flow __user *ufp) struct odp_flow uf; int error; - if (copy_from_user(&uf, ufp, sizeof uf)) + if (copy_from_user(&uf, ufp, sizeof(uf))) return -EFAULT; flow = do_del_flow(dp, &uf.key); @@ -1032,7 +1032,7 @@ static int do_query_flows(struct datapath *dp, const struct odp_flowvec *flowvec struct tbl_node *flow_node; int error; - if (copy_from_user(&uf, ufp, sizeof uf)) + if (copy_from_user(&uf, ufp, sizeof(uf))) return -EFAULT; flow_node = tbl_lookup(table, &uf.key, flow_hash(&uf.key), flow_cmp); @@ -1060,7 +1060,7 @@ static int list_flow(struct tbl_node *node, void *cbdata_) struct odp_flow __user *ufp = &cbdata->uflows[cbdata->listed_flows++]; int error; - if (copy_to_user(&ufp->key, &flow->key, sizeof flow->key)) + if (copy_to_user(&ufp->key, &flow->key, sizeof(flow->key))) return -EFAULT; error = answer_query(cbdata->dp, flow, 0, ufp); if (error) @@ -1097,7 +1097,7 @@ static int do_flowvec_ioctl(struct datapath *dp, unsigned long argp, int retval; uflowvec = (struct odp_flowvec __user *)argp; - if (copy_from_user(&flowvec, uflowvec, sizeof flowvec)) + if (copy_from_user(&flowvec, uflowvec, sizeof(flowvec))) return -EFAULT; if (flowvec.n_flows > INT_MAX / sizeof(struct odp_flow)) @@ -1182,7 +1182,7 @@ static int execute_packet(struct datapath *dp, const struct odp_execute __user * { struct odp_execute execute; - if (copy_from_user(&execute, executep, sizeof execute)) + if (copy_from_user(&execute, executep, sizeof(execute))) return -EFAULT; return do_execute(dp, &execute); @@ -1219,7 +1219,7 @@ static int get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp) } stats.max_miss_queue = DP_MAX_QUEUE_LEN; stats.max_action_queue = DP_MAX_QUEUE_LEN; - return copy_to_user(statsp, &stats, sizeof stats) ? -EFAULT : 0; + return copy_to_user(statsp, &stats, sizeof(stats)) ? -EFAULT : 0; } /* MTU of the dp pseudo-device: ETH_DATA_LEN or the minimum of the ports */ @@ -1267,17 +1267,17 @@ static int put_port(const struct vport *p, struct odp_port __user *uop) { struct odp_port op; - memset(&op, 0, sizeof op); + memset(&op, 0, sizeof(op)); rcu_read_lock(); - strncpy(op.devname, vport_get_name(p), sizeof op.devname); - strncpy(op.type, vport_get_type(p), sizeof op.type); + strncpy(op.devname, vport_get_name(p), sizeof(op.devname)); + strncpy(op.type, vport_get_type(p), sizeof(op.type)); vport_get_config(p, op.config); rcu_read_unlock(); op.port = p->port_no; - return copy_to_user(uop, &op, sizeof op) ? -EFAULT : 0; + return copy_to_user(uop, &op, sizeof(op)) ? -EFAULT : 0; } static int query_port(struct datapath *dp, struct odp_port __user *uport) @@ -1285,7 +1285,7 @@ static int query_port(struct datapath *dp, struct odp_port __user *uport) struct odp_port port; struct vport *vport; - if (copy_from_user(&port, uport, sizeof port)) + if (copy_from_user(&port, uport, sizeof(port))) return -EFAULT; if (port.devname[0]) { @@ -1333,7 +1333,7 @@ static int list_ports(struct datapath *dp, struct odp_portvec __user *upv) struct odp_portvec pv; int retval; - if (copy_from_user(&pv, upv, sizeof pv)) + if (copy_from_user(&pv, upv, sizeof(pv))) return -EFAULT; retval = do_list_ports(dp, (struct odp_port __user __force *)pv.ports, @@ -1519,7 +1519,7 @@ static int compat_list_ports(struct datapath *dp, struct compat_odp_portvec __us struct compat_odp_portvec pv; int retval; - if (copy_from_user(&pv, upv, sizeof pv)) + if (copy_from_user(&pv, upv, sizeof(pv))) return -EFAULT; retval = do_list_ports(dp, compat_ptr(pv.ports), pv.n_ports); @@ -1639,7 +1639,7 @@ static int compat_list_flow(struct tbl_node *node, void *cbdata_) struct compat_odp_flow __user *ufp = &cbdata->uflows[cbdata->listed_flows++]; int error; - if (copy_to_user(&ufp->key, &flow->key, sizeof flow->key)) + if (copy_to_user(&ufp->key, &flow->key, sizeof(flow->key))) return -EFAULT; error = compat_answer_query(cbdata->dp, flow, 0, ufp); if (error) @@ -1679,8 +1679,8 @@ static int compat_flowvec_ioctl(struct datapath *dp, unsigned long argp, int retval; uflowvec = compat_ptr(argp); - if (!access_ok(VERIFY_WRITE, uflowvec, sizeof *uflowvec) || - copy_from_user(&flowvec, uflowvec, sizeof flowvec)) + if (!access_ok(VERIFY_WRITE, uflowvec, sizeof(*uflowvec)) || + copy_from_user(&flowvec, uflowvec, sizeof(flowvec))) return -EFAULT; if (flowvec.n_flows > INT_MAX / sizeof(struct compat_odp_flow)) diff --git a/datapath/flow.c b/datapath/flow.c index ccc72d343..0f73c66c1 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -115,7 +115,7 @@ struct sw_flow_actions *flow_actions_alloc(u32 actions_len) if (actions_len > 2 * DP_MAX_PORTS * nla_total_size(4)) return ERR_PTR(-EINVAL); - sfa = kmalloc(sizeof *sfa + actions_len, GFP_KERNEL); + sfa = kmalloc(sizeof(*sfa) + actions_len, GFP_KERNEL); if (!sfa) return ERR_PTR(-ENOMEM); @@ -270,7 +270,7 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key, { struct ethhdr *eth; - memset(key, 0, sizeof *key); + memset(key, 0, sizeof(*key)); key->tun_id = OVS_CB(skb)->tun_id; key->in_port = in_port; *is_frag = false; @@ -384,7 +384,7 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key, u32 flow_hash(const struct odp_flow_key *key) { - return jhash2((u32*)key, sizeof *key / sizeof(u32), hash_seed); + return jhash2((u32*)key, sizeof(*key) / sizeof(u32), hash_seed); } int flow_cmp(const struct tbl_node *node, void *key2_) @@ -404,7 +404,7 @@ int flow_init(void) if (flow_cache == NULL) return -ENOMEM; - get_random_bytes(&hash_seed, sizeof hash_seed); + get_random_bytes(&hash_seed, sizeof(hash_seed)); return 0; } diff --git a/datapath/table.c b/datapath/table.c index b54534a6d..79b9bc1bd 100644 --- a/datapath/table.c +++ b/datapath/table.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011 Nicira Networks. * Distributed under the terms of the GNU GPL version 2. * * Significant portions of this file may be copied from parts of the Linux @@ -98,7 +98,7 @@ struct tbl *tbl_create(unsigned int n_buckets) { struct tbl *table; - table = kzalloc(sizeof *table, GFP_KERNEL); + table = kzalloc(sizeof(*table), GFP_KERNEL); if (!table) goto err; -- 2.43.0