mm/memory_hotplug: export generic_online_page()

[linux.git] / include / linux / mroute_base.h

diff --git a/include/linux/mroute_base.h b/include/linux/mroute_base.h
index 34de06b426efbeae9ac98a1ba7b0e4fd12004df1..8071148f29a6ec6a95df7e74bbfdeab5b5f6a644 100644 (file)
--- a/include/linux/mroute_base.h
+++ b/include/linux/mroute_base.h
@@ -47,16 +47,16 @@ struct vif_entry_notifier_info {
 };
 
 static inline int mr_call_vif_notifier(struct notifier_block *nb,
-                                      struct net *net,
                                       unsigned short family,
                                       enum fib_event_type event_type,
                                       struct vif_device *vif,
-                                      unsigned short vif_index, u32 tb_id)
+                                      unsigned short vif_index, u32 tb_id,
+                                      struct netlink_ext_ack *extack)
 {
        struct vif_entry_notifier_info info = {
                .info = {
                        .family = family,
-                       .net = net,
+                       .extack = extack,
                },
                .dev = vif->dev,
                .vif_index = vif_index,
@@ -64,7 +64,7 @@ static inline int mr_call_vif_notifier(struct notifier_block *nb,
                .tb_id = tb_id,
        };
 
-       return call_fib_notifier(nb, net, event_type, &info.info);
+       return call_fib_notifier(nb, event_type, &info.info);
 }
 
 static inline int mr_call_vif_notifiers(struct net *net,
@@ -77,7 +77,6 @@ static inline int mr_call_vif_notifiers(struct net *net,
        struct vif_entry_notifier_info info = {
                .info = {
                        .family = family,
-                       .net = net,
                },
                .dev = vif->dev,
                .vif_index = vif_index,
@@ -173,21 +172,21 @@ struct mfc_entry_notifier_info {
 };
 
 static inline int mr_call_mfc_notifier(struct notifier_block *nb,
-                                      struct net *net,
                                       unsigned short family,
                                       enum fib_event_type event_type,
-                                      struct mr_mfc *mfc, u32 tb_id)
+                                      struct mr_mfc *mfc, u32 tb_id,
+                                      struct netlink_ext_ack *extack)
 {
        struct mfc_entry_notifier_info info = {
                .info = {
                        .family = family,
-                       .net = net,
+                       .extack = extack,
                },
                .mfc = mfc,
                .tb_id = tb_id
        };
 
-       return call_fib_notifier(nb, net, event_type, &info.info);
+       return call_fib_notifier(nb, event_type, &info.info);
 }
 
 static inline int mr_call_mfc_notifiers(struct net *net,
@@ -199,7 +198,6 @@ static inline int mr_call_mfc_notifiers(struct net *net,
        struct mfc_entry_notifier_info info = {
                .info = {
                        .family = family,
-                       .net = net,
                },
                .mfc = mfc,
                .tb_id = tb_id
@@ -301,10 +299,11 @@ int mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb,
 
 int mr_dump(struct net *net, struct notifier_block *nb, unsigned short family,
            int (*rules_dump)(struct net *net,
-                             struct notifier_block *nb),
+                             struct notifier_block *nb,
+                             struct netlink_ext_ack *extack),
            struct mr_table *(*mr_iter)(struct net *net,
                                        struct mr_table *mrt),
-           rwlock_t *mrt_lock);
+           rwlock_t *mrt_lock, struct netlink_ext_ack *extack);
 #else
 static inline void vif_device_init(struct vif_device *v,
                                   struct net_device *dev,
@@ -355,10 +354,11 @@ mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb,
 static inline int mr_dump(struct net *net, struct notifier_block *nb,
                          unsigned short family,
                          int (*rules_dump)(struct net *net,
-                                           struct notifier_block *nb),
+                                           struct notifier_block *nb,
+                                           struct netlink_ext_ack *extack),
                          struct mr_table *(*mr_iter)(struct net *net,
                                                      struct mr_table *mrt),
-                         rwlock_t *mrt_lock)
+                         rwlock_t *mrt_lock, struct netlink_ext_ack *extack)
 {
        return -EINVAL;
 }