linux-merge October 2021

linux-merge@lists.open-mesh.org

2 participants
24 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20211019
by batman＠open-mesh.org 19 Oct '21

19 Oct '21

The following commit has been merged in the master branch: commit 254ec036db1123b10e23e1412c191a3cf70dce71 Author: Kyungrok Chung <acadx0(a)gmail.com> Date: Sat Oct 16 20:21:36 2021 +0900 net: make use of helper netif_is_bridge_master() Make use of netdev helper functions to improve code readability. Replace 'dev->priv_flags & IFF_EBRIDGE' with netif_is_bridge_master(dev). Signed-off-by: Kyungrok Chung <acadx0(a)gmail.com> Reviewed-by: Nikolay Aleksandrov <nikolay(a)nvidia.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index a3b6658ed789..433901dcf0c3 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -89,7 +89,7 @@ static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface) rcu_read_lock(); do { upper = netdev_master_upper_dev_get_rcu(upper); - } while (upper && !(upper->priv_flags & IFF_EBRIDGE)); + } while (upper && !netif_is_bridge_master(upper)); dev_hold(upper); rcu_read_unlock(); diff --git a/net/bridge/br.c b/net/bridge/br.c index d3a32c6813e0..1fac72cc617f 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -36,7 +36,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v bool changed_addr; int err; - if (dev->priv_flags & IFF_EBRIDGE) { + if (netif_is_bridge_master(dev)) { err = br_vlan_bridge_event(dev, event, ptr); if (err) return notifier_from_errno(err); @@ -349,7 +349,7 @@ static void __net_exit br_net_exit(struct net *net) rtnl_lock(); for_each_netdev(net, dev) - if (dev->priv_flags & IFF_EBRIDGE) + if (netif_is_bridge_master(dev)) br_dev_delete(dev, &list); unregister_netdevice_many(&list); diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 46812b659710..a6a68e18c70a 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -825,7 +825,7 @@ int br_fdb_dump(struct sk_buff *skb, struct net_bridge_fdb_entry *f; int err = 0; - if (!(dev->priv_flags & IFF_EBRIDGE)) + if (!netif_is_bridge_master(dev)) return err; if (!filter_dev) { @@ -1076,7 +1076,7 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], return -EINVAL; } - if (dev->priv_flags & IFF_EBRIDGE) { + if (netif_is_bridge_master(dev)) { br = netdev_priv(dev); vg = br_vlan_group(br); } else { @@ -1173,7 +1173,7 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], struct net_bridge *br; int err; - if (dev->priv_flags & IFF_EBRIDGE) { + if (netif_is_bridge_master(dev)) { br = netdev_priv(dev); vg = br_vlan_group(br); } else { diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 4a02f8bb278a..c11bba3e7ec0 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -471,7 +471,7 @@ int br_del_bridge(struct net *net, const char *name) if (dev == NULL) ret = -ENXIO; /* Could not find device */ - else if (!(dev->priv_flags & IFF_EBRIDGE)) { + else if (!netif_is_bridge_master(dev)) { /* Attempt to delete non bridge device! */ ret = -EPERM; } diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c index 49c268871fc1..db4ab2c2ce18 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c @@ -26,7 +26,7 @@ static int get_bridge_ifindices(struct net *net, int *indices, int num) for_each_netdev_rcu(net, dev) { if (i >= num) break; - if (dev->priv_flags & IFF_EBRIDGE) + if (netif_is_bridge_master(dev)) indices[i++] = dev->ifindex; } rcu_read_unlock(); diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 0281453f7766..61ccf46fcc21 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -422,7 +422,7 @@ static int br_mdb_dump(struct sk_buff *skb, struct netlink_callback *cb) cb->seq = net->dev_base_seq; for_each_netdev_rcu(net, dev) { - if (dev->priv_flags & IFF_EBRIDGE) { + if (netif_is_bridge_master(dev)) { struct net_bridge *br = netdev_priv(dev); struct br_port_msg *bpm; @@ -1016,7 +1016,7 @@ static int br_mdb_parse(struct sk_buff *skb, struct nlmsghdr *nlh, return -ENODEV; } - if (!(dev->priv_flags & IFF_EBRIDGE)) { + if (!netif_is_bridge_master(dev)) { NL_SET_ERR_MSG_MOD(extack, "Device is not a bridge"); return -EOPNOTSUPP; } diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c index 8edfb98ae1d5..b5af68c105a8 100644 --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c @@ -968,7 +968,7 @@ static int brnf_device_event(struct notifier_block *unused, unsigned long event, struct net *net; int ret; - if (event != NETDEV_REGISTER || !(dev->priv_flags & IFF_EBRIDGE)) + if (event != NETDEV_REGISTER || !netif_is_bridge_master(dev)) return NOTIFY_DONE; ASSERT_RTNL(); diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 5c6c4305ed23..0c8b5f1a15bc 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -106,7 +106,7 @@ static size_t br_get_link_af_size_filtered(const struct net_device *dev, p = br_port_get_check_rcu(dev); if (p) vg = nbp_vlan_group_rcu(p); - } else if (dev->priv_flags & IFF_EBRIDGE) { + } else if (netif_is_bridge_master(dev)) { br = netdev_priv(dev); vg = br_vlan_group_rcu(br); } @@ -1050,7 +1050,7 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags) p = br_port_get_rtnl(dev); /* We want to accept dev as bridge itself as well */ - if (!p && !(dev->priv_flags & IFF_EBRIDGE)) + if (!p && !netif_is_bridge_master(dev)) return -EINVAL; err = br_afspec(br, p, afspec, RTM_DELLINK, &changed, NULL); diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 2dc1b209ba91..564d24c451af 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -4384,7 +4384,7 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb) continue; if (br_dev != netdev_master_upper_dev_get(dev) && - !(dev->priv_flags & IFF_EBRIDGE)) + !netif_is_bridge_master(dev)) continue; cops = ops; } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20211013
by batman＠open-mesh.org 13 Oct '21

13 Oct '21

The following commit has been merged in the master branch: commit 1986c10acc9c906e453fb19d86e6342e8e525824 Merge: 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc 4afb912f439c4bc4e6a4f3e7547f2e69e354108f Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Mon Oct 11 16:48:19 2021 -0700 Merge tag 'for-5.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux Pull btrfs fixes from David Sterba: "A few more error handling fixes, stemming from code inspection, error injection or fuzzing" * tag 'for-5.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: fix abort logic in btrfs_replace_file_extents btrfs: check for error when looking up inode during dir entry replay btrfs: unify lookup return value when dir entry is missing btrfs: deal with errors when adding inode reference during log replay btrfs: deal with errors when replaying dir entry during log replay btrfs: deal with errors when checking if a dir entry exists during log replay btrfs: update refs for any root except tree log roots btrfs: unlock newly allocated extent buffer after error diff --combined fs/btrfs/ctree.h index dff2c8a3e059,852a49dcc22b..c0cebcf745ce --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@@ -3030,7 -3030,7 +3030,7 @@@ struct btrfs_dir_item btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, u64 dir, - u64 objectid, const char *name, int name_len, + u64 index, const char *name, int name_len, int mod); struct btrfs_dir_item * btrfs_search_dir_index_item(struct btrfs_root *root, @@@ -3706,7 -3706,7 +3706,7 @@@ static inline int __btrfs_fs_compat_ro( /* acl.c */ #ifdef CONFIG_BTRFS_FS_POSIX_ACL -struct posix_acl *btrfs_get_acl(struct inode *inode, int type); +struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu); int btrfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode, struct posix_acl *acl, int type); int btrfs_init_acl(struct btrfs_trans_handle *trans, -- LinuxNextTracking

1 0

Build check errors found: 2021-10-12
by postmaster＠open-mesh.org 12 Oct '21

12 Oct '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 327 Tested Linux versions: 41 Tested configs: 119 master ------ Failed tests: 1 Started build tests: 299 Tested Linux versions: 41 Tested configs: 116

1 0

Build check errors found: 2021-10-11
by postmaster＠open-mesh.org 11 Oct '21

11 Oct '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 311 Tested Linux versions: 41 Tested configs: 115 master ------ Failed tests: 1 Started build tests: 298 Tested Linux versions: 41 Tested configs: 114

1 0

Build check errors found: 2021-10-10
by postmaster＠open-mesh.org 10 Oct '21

10 Oct '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 323 Tested Linux versions: 41 Tested configs: 118 master ------ Failed tests: 1 Started build tests: 272 Tested Linux versions: 41 Tested configs: 110

1 0

Build check errors found: 2021-10-09
by postmaster＠open-mesh.org 09 Oct '21

09 Oct '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 299 Tested Linux versions: 41 Tested configs: 113 maint ----- Failed tests: 0 Started build tests: 296 Tested Linux versions: 41 Tested configs: 115

1 0

Build check errors found: 2021-10-08
by postmaster＠open-mesh.org 08 Oct '21

08 Oct '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 335 Tested Linux versions: 41 Tested configs: 120 master ------ Failed tests: 1 Started build tests: 272 Tested Linux versions: 41 Tested configs: 115

1 0

Build check errors found: 2021-10-07
by postmaster＠open-mesh.org 07 Oct '21

07 Oct '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 299 Tested Linux versions: 41 Tested configs: 115 master ------ Failed tests: 1 Started build tests: 260 Tested Linux versions: 41 Tested configs: 114

1 0

Build check errors found: 2021-10-06
by postmaster＠open-mesh.org 06 Oct '21

06 Oct '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 286 Tested Linux versions: 41 Tested configs: 117 maint ----- Failed tests: 0 Started build tests: 391 Tested Linux versions: 41 Tested configs: 120

1 0

Build check errors found: 2021-10-05
by postmaster＠open-mesh.org 05 Oct '21

05 Oct '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 297 Tested Linux versions: 41 Tested configs: 116 maint ----- Failed tests: 0 Started build tests: 313 Tested Linux versions: 41 Tested configs: 119

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge October 2021