From: Al Viro <viro@ftp.linux.org.uk>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>, linux-kernel@vger.kernel.org
Subject: [RFC] gfp flags annotations - part 5 (net/*)
Date: Sun, 9 Oct 2005 06:38:35 +0100 [thread overview]
Message-ID: <20051009053835.GJ7992@ftp.linux.org.uk> (raw)
In-Reply-To: <Pine.LNX.4.64.0510081630030.31407@g5.osdl.org>
missing gfp_t in net/* and around
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
----
diff -urN lib/include/linux/security.h net/include/linux/security.h
--- lib/include/linux/security.h 2005-10-08 21:04:47.000000000 -0400
+++ net/include/linux/security.h 2005-10-09 01:22:12.000000000 -0400
@@ -1210,7 +1210,7 @@
int (*socket_shutdown) (struct socket * sock, int how);
int (*socket_sock_rcv_skb) (struct sock * sk, struct sk_buff * skb);
int (*socket_getpeersec) (struct socket *sock, char __user *optval, int __user *optlen, unsigned len);
- int (*sk_alloc_security) (struct sock *sk, int family, int priority);
+ int (*sk_alloc_security) (struct sock *sk, int family, gfp_t priority);
void (*sk_free_security) (struct sock *sk);
#endif /* CONFIG_SECURITY_NETWORK */
};
diff -urN lib/include/net/sock.h net/include/net/sock.h
--- lib/include/net/sock.h 2005-10-08 21:04:47.000000000 -0400
+++ net/include/net/sock.h 2005-10-09 01:22:12.000000000 -0400
@@ -207,7 +207,7 @@
struct sk_buff_head sk_write_queue;
int sk_wmem_queued;
int sk_forward_alloc;
- unsigned int sk_allocation;
+ gfp_t sk_allocation;
int sk_sndbuf;
int sk_route_caps;
unsigned long sk_flags;
diff -urN lib/net/core/sock.c net/net/core/sock.c
--- lib/net/core/sock.c 2005-10-08 21:04:47.000000000 -0400
+++ net/net/core/sock.c 2005-10-09 01:22:12.000000000 -0400
@@ -940,7 +940,7 @@
int noblock, int *errcode)
{
struct sk_buff *skb;
- unsigned int gfp_mask;
+ gfp_t gfp_mask;
long timeo;
int err;
diff -urN lib/net/dccp/output.c net/net/dccp/output.c
--- lib/net/dccp/output.c 2005-09-22 14:50:54.000000000 -0400
+++ net/net/dccp/output.c 2005-10-09 01:22:12.000000000 -0400
@@ -495,7 +495,7 @@
{
struct dccp_sock *dp = dccp_sk(sk);
struct sk_buff *skb;
- const unsigned int prio = active ? GFP_KERNEL : GFP_ATOMIC;
+ const gfp_t prio = active ? GFP_KERNEL : GFP_ATOMIC;
skb = alloc_skb(sk->sk_prot->max_header, prio);
if (skb == NULL)
diff -urN lib/net/netlink/af_netlink.c net/net/netlink/af_netlink.c
--- lib/net/netlink/af_netlink.c 2005-10-08 21:04:47.000000000 -0400
+++ net/net/netlink/af_netlink.c 2005-10-09 01:22:12.000000000 -0400
@@ -827,7 +827,7 @@
int failure;
int congested;
int delivered;
- unsigned int allocation;
+ gfp_t allocation;
struct sk_buff *skb, *skb2;
};
diff -urN lib/security/dummy.c net/security/dummy.c
--- lib/security/dummy.c 2005-09-22 14:50:54.000000000 -0400
+++ net/security/dummy.c 2005-10-09 01:22:12.000000000 -0400
@@ -768,7 +768,7 @@
return -ENOPROTOOPT;
}
-static inline int dummy_sk_alloc_security (struct sock *sk, int family, int priority)
+static inline int dummy_sk_alloc_security (struct sock *sk, int family, gfp_t priority)
{
return 0;
}
diff -urN lib/security/selinux/hooks.c net/security/selinux/hooks.c
--- lib/security/selinux/hooks.c 2005-09-30 20:59:37.000000000 -0400
+++ net/security/selinux/hooks.c 2005-10-09 01:22:12.000000000 -0400
@@ -262,7 +262,7 @@
}
#ifdef CONFIG_SECURITY_NETWORK
-static int sk_alloc_security(struct sock *sk, int family, int priority)
+static int sk_alloc_security(struct sock *sk, int family, gfp_t priority)
{
struct sk_security_struct *ssec;
@@ -3380,7 +3380,7 @@
return err;
}
-static int selinux_sk_alloc_security(struct sock *sk, int family, int priority)
+static int selinux_sk_alloc_security(struct sock *sk, int family, gfp_t priority)
{
return sk_alloc_security(sk, family, priority);
}
next prev parent reply other threads:[~2005-10-09 5:38 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-05 3:58 [PATCHSET] 2.6.13-git3-bird1 viro
2005-09-05 15:55 ` Alexey Dobriyan
2005-09-05 16:03 ` viro
2005-09-05 16:47 ` [PATCHSET] 2.6.13-git5-bird1 viro
2005-09-05 21:20 ` [PATCHSET] 2.6.13-git5-bird2 viro
2005-09-07 18:31 ` [PATCHSET] 2.6.13-git7-bird1 viro
2005-09-12 19:17 ` [PATCHSET] 2.6.13-git12-bird1 Al Viro
2005-09-12 19:20 ` Al Viro
2005-09-30 12:08 ` [PATCHSET] 2.6.14-rc2-git8-bird1 Al Viro
2005-09-30 12:56 ` kernel cross-toolchain (FC4) Al Viro
2005-09-30 16:09 ` kernel cross-toolchain (Gentoo) Alexey Dobriyan
2005-09-30 16:05 ` Al Viro
2005-09-30 17:55 ` Alexey Dobriyan
2005-09-30 19:31 ` Al Viro
2005-09-30 22:28 ` Alexey Dobriyan
2005-09-30 19:06 ` Alexey Dobriyan
2005-10-04 20:30 ` [PATCHSET] 2.6.14-rc3-git4-bird1 Al Viro
2005-10-05 20:29 ` Alexey Dobriyan
2005-10-06 20:15 ` [RFC] gfp flags annotations Al Viro
2005-10-07 2:56 ` Greg KH
[not found] ` <20051007064604.GB7992@ftp.linux.org.uk>
2005-10-07 10:01 ` [PATCH] gfp flags annotations - part 1 Alexey Dobriyan
2005-10-07 10:04 ` Heiko Carstens
2005-10-07 12:27 ` Alexey Dobriyan
2005-10-08 23:34 ` [RFC] gfp flags annotations Linus Torvalds
2005-10-09 1:13 ` Alexey Dobriyan
2005-10-09 1:06 ` Al Viro
2005-10-09 5:32 ` [RFC] gfp flags annotations - part 2 Al Viro
2005-10-09 5:35 ` [RFC] gfp flags annotations - part 3 (simple parts of mm/*) Al Viro
2005-10-09 5:36 ` [RFC] gfp flags annotations - part 4 (lib/*) Al Viro
2005-10-09 5:38 ` Al Viro [this message]
2005-10-09 5:55 ` [RFC] gfp flags annotations - part 6 (simple parts of fs/*) Al Viro
2005-10-09 15:41 ` Tom Zanussi
2005-10-09 6:01 ` [RFC] gfp flags annotations - part 7 (block layer) Al Viro
2005-09-12 20:42 ` [PATCH] n_r3964: drop bogus fmt casts Alexey Dobriyan
2005-09-12 20:39 ` Al Viro
2005-09-05 18:39 ` [PATCHSET] 2.6.13-git3-bird1 viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051009053835.GJ7992@ftp.linux.org.uk \
--to=viro@ftp.linux.org.uk \
--cc=adobriyan@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).