treewide: Use sizeof_field() macro
Replace all the occurrences of FIELD_SIZEOF() with sizeof_field() except at places where these are defined. Later patches will remove the unused definition of FIELD_SIZEOF(). This patch is generated using following script: EXCLUDE_FILES="include/linux/stddef.h|include/linux/kernel.h" git grep -l -e "\bFIELD_SIZEOF\b" | while read file; do if [[ "$file" =~ $EXCLUDE_FILES ]]; then continue fi sed -i -e 's/\bFIELD_SIZEOF\b/sizeof_field/g' $file; done Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> Link: https://lore.kernel.org/r/20190924105839.110713-3-pankaj.laxminarayan.bharadiya@intel.com Co-developed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: David Miller <davem@davemloft.net> # for net
This commit is contained in:

committed by
Kees Cook

parent
e43723292d
commit
c593642c8b
@@ -37,7 +37,7 @@ enum sw_flow_mac_proto {
|
||||
* matching for small options.
|
||||
*/
|
||||
#define TUN_METADATA_OFFSET(opt_len) \
|
||||
(FIELD_SIZEOF(struct sw_flow_key, tun_opts) - opt_len)
|
||||
(sizeof_field(struct sw_flow_key, tun_opts) - opt_len)
|
||||
#define TUN_METADATA_OPTS(flow_key, opt_len) \
|
||||
((void *)((flow_key)->tun_opts + TUN_METADATA_OFFSET(opt_len)))
|
||||
|
||||
@@ -52,7 +52,7 @@ struct vlan_head {
|
||||
|
||||
#define OVS_SW_FLOW_KEY_METADATA_SIZE \
|
||||
(offsetof(struct sw_flow_key, recirc_id) + \
|
||||
FIELD_SIZEOF(struct sw_flow_key, recirc_id))
|
||||
sizeof_field(struct sw_flow_key, recirc_id))
|
||||
|
||||
struct ovs_key_nsh {
|
||||
struct ovs_nsh_key_base base;
|
||||
|
Reference in New Issue
Block a user