projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mlx4: In RoCE allow guests to have multiple GIDS
[cascardo/linux.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index
879933a
..
840cffb
100644
(file)
--- a/
net/socket.c
+++ b/
net/socket.c
@@
-593,7
+593,7
@@
void sock_release(struct socket *sock)
}
if (rcu_dereference_protected(sock->wq, 1)->fasync_list)
}
if (rcu_dereference_protected(sock->wq, 1)->fasync_list)
- pr
intk(KERN_ERR "sock_release: fasync list not empty!\n"
);
+ pr
_err("%s: fasync list not empty!\n", __func__
);
if (test_bit(SOCK_EXTERNALLY_ALLOCATED, &sock->flags))
return;
if (test_bit(SOCK_EXTERNALLY_ALLOCATED, &sock->flags))
return;
@@
-1265,8
+1265,8
@@
int __sock_create(struct net *net, int family, int type, int protocol,
static int warned;
if (!warned) {
warned = 1;
static int warned;
if (!warned) {
warned = 1;
- pr
intk(KERN_INFO
"%s uses obsolete (PF_INET,SOCK_PACKET)\n",
- current->comm);
+ pr
_info(
"%s uses obsolete (PF_INET,SOCK_PACKET)\n",
+
current->comm);
}
family = PF_PACKET;
}
}
family = PF_PACKET;
}
@@
-2595,8
+2595,7
@@
int sock_register(const struct net_proto_family *ops)
int err;
if (ops->family >= NPROTO) {
int err;
if (ops->family >= NPROTO) {
- printk(KERN_CRIT "protocol %d >= NPROTO(%d)\n", ops->family,
- NPROTO);
+ pr_crit("protocol %d >= NPROTO(%d)\n", ops->family, NPROTO);
return -ENOBUFS;
}
return -ENOBUFS;
}
@@
-2610,7
+2609,7
@@
int sock_register(const struct net_proto_family *ops)
}
spin_unlock(&net_family_lock);
}
spin_unlock(&net_family_lock);
- pr
intk(KERN_INFO
"NET: Registered protocol family %d\n", ops->family);
+ pr
_info(
"NET: Registered protocol family %d\n", ops->family);
return err;
}
EXPORT_SYMBOL(sock_register);
return err;
}
EXPORT_SYMBOL(sock_register);
@@
-2638,7
+2637,7
@@
void sock_unregister(int family)
synchronize_rcu();
synchronize_rcu();
- pr
intk(KERN_INFO
"NET: Unregistered protocol family %d\n", family);
+ pr
_info(
"NET: Unregistered protocol family %d\n", family);
}
EXPORT_SYMBOL(sock_unregister);
}
EXPORT_SYMBOL(sock_unregister);