diff mbox

[2/3] netlink: Remove an unused pointer in netlink_skb_parms

Message ID a8766c8b116b5e6fcaa932fe94f84a584554b98f.1363815201.git.luto@amacapital.net
State Rejected, archived
Delegated to: David Miller
Headers show

Commit Message

Andy Lutomirski March 20, 2013, 9:38 p.m. UTC
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
---
 include/linux/netlink.h | 1 -
 1 file changed, 1 deletion(-)

Comments

Eric W. Biederman March 21, 2013, 6:36 a.m. UTC | #1
net/ipv4/inet_diag.c:			   sk_user_ns(NETLINK_CB(in_skb).ssk),
net/ipv4/inet_diag.c:				  sk_user_ns(NETLINK_CB(cb->skb).ssk),
net/ipv4/inet_diag.c:					       sk_user_ns(NETLINK_CB(cb->skb).ssk),
net/ipv4/udp_diag.c:			sk_user_ns(NETLINK_CB(cb->skb).ssk),
net/ipv4/udp_diag.c:			   sk_user_ns(NETLINK_CB(in_skb).ssk),
net/netfilter/nfnetlink_log.c:					       sk_user_ns(NETLINK_CB(skb).ssk));
net/netlink/af_netlink.c:		NETLINK_CB(skb).ssk = ssk;
net/sched/cls_flow.c:		    sk_user_ns(NETLINK_CB(in_skb).ssk) != &init_user_ns)

I count 8 uses.

Eric

>
> diff --git a/include/linux/netlink.h b/include/linux/netlink.h
> index e0f746b..9ac1201 100644
> --- a/include/linux/netlink.h
> +++ b/include/linux/netlink.h
> @@ -19,7 +19,6 @@ struct netlink_skb_parms {
>  	struct scm_creds	creds;		/* Skb credentials	*/
>  	__u32			portid;
>  	__u32			dst_group;
> -	struct sock		*ssk;
>  };
>  
>  #define NETLINK_CB(skb)		(*(struct netlink_skb_parms*)&((skb)->cb))
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andy Lutomirski March 21, 2013, 5:41 p.m. UTC | #2
On Wed, Mar 20, 2013 at 11:36 PM, Eric W. Biederman
<ebiederm@xmission.com> wrote:
>
> net/ipv4/inet_diag.c:                      sk_user_ns(NETLINK_CB(in_skb).ssk),
> net/ipv4/inet_diag.c:                             sk_user_ns(NETLINK_CB(cb->skb).ssk),
> net/ipv4/inet_diag.c:                                          sk_user_ns(NETLINK_CB(cb->skb).ssk),
> net/ipv4/udp_diag.c:                    sk_user_ns(NETLINK_CB(cb->skb).ssk),
> net/ipv4/udp_diag.c:                       sk_user_ns(NETLINK_CB(in_skb).ssk),
> net/netfilter/nfnetlink_log.c:                                         sk_user_ns(NETLINK_CB(skb).ssk));
> net/netlink/af_netlink.c:               NETLINK_CB(skb).ssk = ssk;
> net/sched/cls_flow.c:               sk_user_ns(NETLINK_CB(in_skb).ssk) != &init_user_ns)
>
> I count 8 uses.

Whoops.  I clearly fail at grepping and building with the correct
configuration.  I'll drop this patch entirely -- it's independent of
the other two.

>
> Eric
>
>>
>> diff --git a/include/linux/netlink.h b/include/linux/netlink.h
>> index e0f746b..9ac1201 100644
>> --- a/include/linux/netlink.h
>> +++ b/include/linux/netlink.h
>> @@ -19,7 +19,6 @@ struct netlink_skb_parms {
>>       struct scm_creds        creds;          /* Skb credentials      */
>>       __u32                   portid;
>>       __u32                   dst_group;
>> -     struct sock             *ssk;
>>  };
>>
>>  #define NETLINK_CB(skb)              (*(struct netlink_skb_parms*)&((skb)->cb))
diff mbox

Patch

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index e0f746b..9ac1201 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -19,7 +19,6 @@  struct netlink_skb_parms {
 	struct scm_creds	creds;		/* Skb credentials	*/
 	__u32			portid;
 	__u32			dst_group;
-	struct sock		*ssk;
 };
 
 #define NETLINK_CB(skb)		(*(struct netlink_skb_parms*)&((skb)->cb))