UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely) 

Some code here depends on CONFIG_KMOD to not try to load
protocol modules or similar, replace by CONFIG_MODULES
where more than just request_module depends on CONFIG_KMOD
and and also use try_then_request_module in ebtables.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Johannes Berg 2008-10-16 15:24:51 -07:00 committed by David S. Miller
parent 00269b54ed
commit 95a5afca4a
20 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/bluetooth/af_bluetooth.c
View File

@ -37,10 +37,7 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <net/sock.h> #include <net/sock.h>
#include <asm/ioctls.h> #include <asm/ioctls.h>
#if defined(CONFIG_KMOD)
#include <linux/kmod.h> #include <linux/kmod.h>
#endif
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
@ -145,11 +142,8 @@ static int bt_sock_create(struct net *net, struct socket *sock, int proto)
if (proto < 0 || proto >= BT_MAX_PROTO) if (proto < 0 || proto >= BT_MAX_PROTO)
return -EINVAL; return -EINVAL;
#if defined(CONFIG_KMOD) if (!bt_proto[proto])
if (!bt_proto[proto]) {
request_module("bt-proto-%d", proto); request_module("bt-proto-%d", proto);
}
#endif
err = -EPROTONOSUPPORT; err = -EPROTONOSUPPORT;

15
net/bridge/netfilter/ebtables.c
View File

@ -305,23 +305,14 @@ find_inlist_lock_noload(struct list_head *head, const char *name, int *error,
return NULL; return NULL;
} }
#ifndef CONFIG_KMOD
#define find_inlist_lock(h,n,p,e,m) find_inlist_lock_noload((h),(n),(e),(m))
#else
static void * static void *
find_inlist_lock(struct list_head *head, const char *name, const char *prefix, find_inlist_lock(struct list_head *head, const char *name, const char *prefix,
int *error, struct mutex *mutex) int *error, struct mutex *mutex)
{ {
void *ret; return try_then_request_module(
find_inlist_lock_noload(head, name, error, mutex),
ret = find_inlist_lock_noload(head, name, error, mutex); "%s%s", prefix, name);
if (!ret) {
request_module("%s%s", prefix, name);
ret = find_inlist_lock_noload(head, name, error, mutex);
}
return ret;
} }
#endif
static inline struct ebt_table * static inline struct ebt_table *
find_table_lock(const char *name, int *error, struct mutex *mutex) find_table_lock(const char *name, int *error, struct mutex *mutex)

4
net/can/af_can.c
View File

@ -128,8 +128,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol)
if (net != &init_net) if (net != &init_net)
return -EAFNOSUPPORT; return -EAFNOSUPPORT;
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
/* try to load protocol module, when CONFIG_KMOD is defined */ /* try to load protocol module kernel is modular */
if (!proto_tab[protocol]) { if (!proto_tab[protocol]) {
err = request_module("can-proto-%d", protocol); err = request_module("can-proto-%d", protocol);

2
net/core/dev.c
View File

@ -4956,8 +4956,6 @@ EXPORT_SYMBOL(br_fdb_get_hook);
EXPORT_SYMBOL(br_fdb_put_hook); EXPORT_SYMBOL(br_fdb_put_hook);
#endif #endif
#ifdef CONFIG_KMOD
EXPORT_SYMBOL(dev_load); EXPORT_SYMBOL(dev_load);
#endif
EXPORT_PER_CPU_SYMBOL(softnet_data); EXPORT_PER_CPU_SYMBOL(softnet_data);

4
net/core/rtnetlink.c
View File

@ -1040,7 +1040,7 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
struct nlattr *linkinfo[IFLA_INFO_MAX+1]; struct nlattr *linkinfo[IFLA_INFO_MAX+1];
int err; int err;
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
replay: replay:
#endif #endif
err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy); err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy);
@ -1129,7 +1129,7 @@ replay:
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (!ops) { if (!ops) {
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
if (kind[0]) { if (kind[0]) {
__rtnl_unlock(); __rtnl_unlock();
request_module("rtnl-link-%s", kind); request_module("rtnl-link-%s", kind);

2
net/dccp/ccid.c
View File

@ -154,7 +154,7 @@ struct ccid *ccid_new(unsigned char id, struct sock *sk, int rx, gfp_t gfp)
struct ccid *ccid = NULL; struct ccid *ccid = NULL;
ccids_read_lock(); ccids_read_lock();
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
if (ccids[id] == NULL) { if (ccids[id] == NULL) {
/* We only try to load if in process context */ /* We only try to load if in process context */
ccids_read_unlock(); ccids_read_unlock();

2
net/decnet/dn_dev.c
View File

@ -490,9 +490,7 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
return -EFAULT; return -EFAULT;
ifr->ifr_name[IFNAMSIZ-1] = 0; ifr->ifr_name[IFNAMSIZ-1] = 0;
#ifdef CONFIG_KMOD
dev_load(&init_net, ifr->ifr_name); dev_load(&init_net, ifr->ifr_name);
#endif
switch(cmd) { switch(cmd) {
case SIOCGIFADDR: case SIOCGIFADDR:

2
net/ipv4/devinet.c
View File

@ -613,9 +613,7 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg)
if (colon) if (colon)
*colon = 0; *colon = 0;
#ifdef CONFIG_KMOD
dev_load(net, ifr.ifr_name); dev_load(net, ifr.ifr_name);
#endif
switch (cmd) { switch (cmd) {
case SIOCGIFADDR: /* Get interface address */ case SIOCGIFADDR: /* Get interface address */

2
net/ipv4/inet_diag.c
View File

@ -53,11 +53,9 @@ static DEFINE_MUTEX(inet_diag_table_mutex);
static const struct inet_diag_handler *inet_diag_lock_handler(int type) static const struct inet_diag_handler *inet_diag_lock_handler(int type)
{ {
#ifdef CONFIG_KMOD
if (!inet_diag_table[type]) if (!inet_diag_table[type])
request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK, request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK,
NETLINK_INET_DIAG, type); NETLINK_INET_DIAG, type);
#endif
mutex_lock(&inet_diag_table_mutex); mutex_lock(&inet_diag_table_mutex);
if (!inet_diag_table[type]) if (!inet_diag_table[type])

4
net/ipv4/tcp_cong.c
View File

@ -115,7 +115,7 @@ int tcp_set_default_congestion_control(const char *name)
spin_lock(&tcp_cong_list_lock); spin_lock(&tcp_cong_list_lock);
ca = tcp_ca_find(name); ca = tcp_ca_find(name);
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
if (!ca && capable(CAP_SYS_MODULE)) { if (!ca && capable(CAP_SYS_MODULE)) {
spin_unlock(&tcp_cong_list_lock); spin_unlock(&tcp_cong_list_lock);
@ -244,7 +244,7 @@ int tcp_set_congestion_control(struct sock *sk, const char *name)
if (ca == icsk->icsk_ca_ops) if (ca == icsk->icsk_ca_ops)
goto out; goto out;
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
/* not found attempt to autoload module */ /* not found attempt to autoload module */
if (!ca && capable(CAP_SYS_MODULE)) { if (!ca && capable(CAP_SYS_MODULE)) {
rcu_read_unlock(); rcu_read_unlock();

2
net/netfilter/nf_conntrack_netlink.c
View File

@ -822,7 +822,7 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct,
parse_nat_setup = rcu_dereference(nfnetlink_parse_nat_setup_hook); parse_nat_setup = rcu_dereference(nfnetlink_parse_nat_setup_hook);
if (!parse_nat_setup) { if (!parse_nat_setup) {
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
rcu_read_unlock(); rcu_read_unlock();
nfnl_unlock(); nfnl_unlock();
if (request_module("nf-nat-ipv4") < 0) { if (request_module("nf-nat-ipv4") < 0) {

2
net/netfilter/nfnetlink.c
View File

@ -137,7 +137,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
replay: replay:
ss = nfnetlink_get_subsys(type); ss = nfnetlink_get_subsys(type);
if (!ss) { if (!ss) {
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
nfnl_unlock(); nfnl_unlock();
request_module("nfnetlink-subsys-%d", NFNL_SUBSYS_ID(type)); request_module("nfnetlink-subsys-%d", NFNL_SUBSYS_ID(type));
nfnl_lock(); nfnl_lock();

2
net/netlink/af_netlink.c
View File

@ -435,7 +435,7 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol)
return -EPROTONOSUPPORT; return -EPROTONOSUPPORT;
netlink_lock_table(); netlink_lock_table();
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
if (!nl_table[protocol].registered) { if (!nl_table[protocol].registered) {
netlink_unlock_table(); netlink_unlock_table();
request_module("net-pf-%d-proto-%d", PF_NETLINK, protocol); request_module("net-pf-%d-proto-%d", PF_NETLINK, protocol);

3
net/phonet/af_phonet.c
View File

@ -67,11 +67,10 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol)
} }
pnp = phonet_proto_get(protocol); pnp = phonet_proto_get(protocol);
#ifdef CONFIG_KMOD
if (pnp == NULL && if (pnp == NULL &&
request_module("net-pf-%d-proto-%d", PF_PHONET, protocol) == 0) request_module("net-pf-%d-proto-%d", PF_PHONET, protocol) == 0)
pnp = phonet_proto_get(protocol); pnp = phonet_proto_get(protocol);
#endif
if (pnp == NULL) if (pnp == NULL)
return -EPROTONOSUPPORT; return -EPROTONOSUPPORT;
if (sock->type != pnp->sock_type) { if (sock->type != pnp->sock_type) {

2
net/sched/act_api.c
View File

@ -494,7 +494,7 @@ struct tc_action *tcf_action_init_1(struct nlattr *nla, struct nlattr *est,
a_o = tc_lookup_action_n(act_name); a_o = tc_lookup_action_n(act_name);
if (a_o == NULL) { if (a_o == NULL) {
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
rtnl_unlock(); rtnl_unlock();
request_module("act_%s", act_name); request_module("act_%s", act_name);
rtnl_lock(); rtnl_lock();

2
net/sched/cls_api.c
View File

@ -227,7 +227,7 @@ replay:
err = -ENOENT; err = -ENOENT;
tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND]); tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND]);
if (tp_ops == NULL) { if (tp_ops == NULL) {
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
struct nlattr *kind = tca[TCA_KIND]; struct nlattr *kind = tca[TCA_KIND];
char name[IFNAMSIZ]; char name[IFNAMSIZ];

2
net/sched/ematch.c
View File

@ -224,7 +224,7 @@ static int tcf_em_validate(struct tcf_proto *tp,
if (em->ops == NULL) { if (em->ops == NULL) {
err = -ENOENT; err = -ENOENT;
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
__rtnl_unlock(); __rtnl_unlock();
request_module("ematch-kind-%u", em_hdr->kind); request_module("ematch-kind-%u", em_hdr->kind);
rtnl_lock(); rtnl_lock();

2
net/sched/sch_api.c
View File

@ -764,7 +764,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue,
struct qdisc_size_table *stab; struct qdisc_size_table *stab;
ops = qdisc_lookup_ops(kind); ops = qdisc_lookup_ops(kind);
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
if (ops == NULL && kind != NULL) { if (ops == NULL && kind != NULL) {
char name[IFNAMSIZ]; char name[IFNAMSIZ];
if (nla_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) { if (nla_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) {

2
net/socket.c
View File

@ -1142,7 +1142,7 @@ static int __sock_create(struct net *net, int family, int type, int protocol,
sock->type = type; sock->type = type;
#if defined(CONFIG_KMOD) #ifdef CONFIG_MODULES
/* Attempt to load a protocol module if the find failed. /* Attempt to load a protocol module if the find failed.
* *
* 12/09/1996 Marcin: But! this makes REALLY only sense, if the user * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user

2
net/sunrpc/auth.c
View File

@ -83,10 +83,8 @@ rpcauth_create(rpc_authflavor_t pseudoflavor, struct rpc_clnt *clnt)
if (flavor >= RPC_AUTH_MAXFLAVOR) if (flavor >= RPC_AUTH_MAXFLAVOR)
goto out; goto out;
#ifdef CONFIG_KMOD
if ((ops = auth_flavors[flavor]) == NULL) if ((ops = auth_flavors[flavor]) == NULL)
request_module("rpc-auth-%u", flavor); request_module("rpc-auth-%u", flavor);
#endif
spin_lock(&rpc_authflavor_lock); spin_lock(&rpc_authflavor_lock);
ops = auth_flavors[flavor]; ops = auth_flavors[flavor];
if (ops == NULL || !try_module_get(ops->owner)) { if (ops == NULL || !try_module_get(ops->owner)) {