diff options
| author |   Xin Long <lucien.xin@gmail.com> | 2021-05-18 10:09:08 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-05-18 13:22:09 -0700 |
| commit | be07f056396d6bb40963c45a02951c566ddeef8e (patch) | |
| tree | 1c1d17db20a5f2977b5d796565e80ab651220855 /net/tipc/core.h | |
| parent | net: mdiobus: get rid of a BUG_ON() (diff) | |
| download | linux-dev-be07f056396d6bb40963c45a02951c566ddeef8e.tar.xz linux-dev-be07f056396d6bb40963c45a02951c566ddeef8e.zip | |
tipc: simplify the finalize work queue
This patch is to use "struct work_struct" for the finalize work queue
instead of "struct tipc_net_work", as it can get the "net" and "addr"
from tipc_net's other members and there is no need to add extra net
and addr in tipc_net by defining "struct tipc_net_work".
Note that it's safe to get net from tn->bcl as bcl is always released
after the finalize work queue is done.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Jon Maloy <jmaloy@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/core.h')
| -rw-r--r-- | net/tipc/core.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h index 5741ae488bb5..0a3f7a70a50a 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h @@ -91,12 +91,6 @@ extern unsigned int tipc_net_id __read_mostly; extern int sysctl_tipc_rmem[3] __read_mostly; extern int sysctl_tipc_named_timeout __read_mostly; -struct tipc_net_work { - struct work_struct work; - struct net *net; - u32 addr; -}; - struct tipc_net { u8 node_id[NODE_ID_LEN]; u32 node_addr; @@ -148,7 +142,7 @@ struct tipc_net { struct tipc_crypto *crypto_tx; #endif /* Work item for net finalize */ - struct tipc_net_work final_work; + struct work_struct work; /* The numbers of work queues in schedule */ atomic_t wq_count; }; |