[PATCH] Remove needless variables in net/core/sock.c

[Kris Katterjohn]

Removes needless "filter" variables.

Signed-off by: Kris Katterjohn <[EMAIL PROTECTED]>

---

This is a diff from 2.6.15-rc7 and I'm not subscribed so please CC me on any
replies.

Thanks!

--- x/net/core/sock.c   2005-12-28 15:10:33.000000000 -0600
+++ y/net/core/sock.c   2005-12-28 15:10:44.000000000 -0600
@@ -195,7 +195,6 @@ int sock_setsockopt(struct socket *sock,
                    char __user *optval, int optlen)
 {
        struct sock *sk=sock->sk;
-       struct sk_filter *filter;
        int val;
        int valbool;
        struct linger ling;
@@ -444,15 +443,13 @@ set_rcvbuf:
                        break;
 
                case SO_DETACH_FILTER:
-                       spin_lock_bh(&sk->sk_lock.slock);
-                       filter = sk->sk_filter;
-                        if (filter) {
+                       if (sk->sk_filter) {
+                               spin_lock_bh(&sk->sk_lock.slock);
+                               sk_filter_release(sk, sk->sk_filter);
                                sk->sk_filter = NULL;
                                spin_unlock_bh(&sk->sk_lock.slock);
-                               sk_filter_release(sk, filter);
                                break;
                        }
-                       spin_unlock_bh(&sk->sk_lock.slock);
                        ret = -ENONET;
                        break;
 
@@ -678,15 +675,13 @@ out_free:
 
 void sk_free(struct sock *sk)
 {
-       struct sk_filter *filter;
        struct module *owner = sk->sk_prot_creator->owner;
 
        if (sk->sk_destruct)
                sk->sk_destruct(sk);
 
-       filter = sk->sk_filter;
-       if (filter) {
-               sk_filter_release(sk, filter);
+       if (sk->sk_filter) {
+               sk_filter_release(sk, sk->sk_filter);
                sk->sk_filter = NULL;
        }
 
@@ -709,8 +704,6 @@ struct sock *sk_clone(const struct sock 
        struct sock *newsk = sk_alloc(sk->sk_family, priority, sk->sk_prot, 0);
 
        if (newsk != NULL) {
-               struct sk_filter *filter;
-
                memcpy(newsk, sk, sk->sk_prot->obj_size);
 
                /* SANITY */
@@ -737,9 +730,8 @@ struct sock *sk_clone(const struct sock 
                sock_reset_flag(newsk, SOCK_DONE);
                skb_queue_head_init(&newsk->sk_error_queue);
 
-               filter = newsk->sk_filter;
-               if (filter != NULL)
-                       sk_filter_charge(newsk, filter);
+               if (newsk->sk_filter != NULL)
+                       sk_filter_charge(newsk, newsk->sk_filter);
 
                if (unlikely(xfrm_sk_clone_policy(newsk))) {
                        /* It is still raw copy of parent, so invalidate


-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html