diff options
| author | Mark Rustad <mark.d.rustad@intel.com> | 2014-10-14 09:28:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-14 17:03:53 -0400 |
| commit | db404b13617fe0cdb415da55762203d456837912 (patch) | |
| tree | 7c9892aefa7351da678184d152e60d24357f587e /include/linux | |
| parent | e53da5fbfc02586fe4506ed583069b8205f3e38d (diff) | |
genl_magic: Resolve logical-op warnings
Resolve "logical 'and' applied to non-boolean constant" warnings"
that appear in W=2 builds by adding !! to a bit test.
Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/genl_magic_func.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h index c0894dd8827b..667c31101b8b 100644 --- a/include/linux/genl_magic_func.h +++ b/include/linux/genl_magic_func.h | |||
| @@ -178,12 +178,12 @@ static int s_name ## _from_attrs_for_change(struct s_name *s, \ | |||
| 178 | #define __assign(attr_nr, attr_flag, name, nla_type, type, assignment...) \ | 178 | #define __assign(attr_nr, attr_flag, name, nla_type, type, assignment...) \ |
| 179 | nla = ntb[attr_nr]; \ | 179 | nla = ntb[attr_nr]; \ |
| 180 | if (nla) { \ | 180 | if (nla) { \ |
| 181 | if (exclude_invariants && ((attr_flag) & DRBD_F_INVARIANT)) { \ | 181 | if (exclude_invariants && !!((attr_flag) & DRBD_F_INVARIANT)) { \ |
| 182 | pr_info("<< must not change invariant attr: %s\n", #name); \ | 182 | pr_info("<< must not change invariant attr: %s\n", #name); \ |
| 183 | return -EEXIST; \ | 183 | return -EEXIST; \ |
| 184 | } \ | 184 | } \ |
| 185 | assignment; \ | 185 | assignment; \ |
| 186 | } else if (exclude_invariants && ((attr_flag) & DRBD_F_INVARIANT)) { \ | 186 | } else if (exclude_invariants && !!((attr_flag) & DRBD_F_INVARIANT)) { \ |
| 187 | /* attribute missing from payload, */ \ | 187 | /* attribute missing from payload, */ \ |
| 188 | /* which was expected */ \ | 188 | /* which was expected */ \ |
| 189 | } else if ((attr_flag) & DRBD_F_REQUIRED) { \ | 189 | } else if ((attr_flag) & DRBD_F_REQUIRED) { \ |
