Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

3 files changed, 24 insertions, 12 deletions

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index ed80af8ca5fb..21cdc872004e 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -332,14 +332,14 @@ static unsigned int x25_new_lci(struct x25_neigh *nb)
 /*
  *      Deferred destroy.
  */
-void x25_destroy_socket(struct sock *);
+static void __x25_destroy_socket(struct sock *);
 
 /*
  *      handler for deferred kills.
  */
 static void x25_destroy_timer(unsigned long data)
 {
-        x25_destroy_socket((struct sock *)data);
+        x25_destroy_socket_from_timer((struct sock *)data);
 }
 
 /*
@@ -349,12 +349,10 @@ static void x25_destroy_timer(unsigned long data)
  *      will touch it and we are (fairly 8-) ) safe.
  *      Not static as it's used by the timer
  */
-void x25_destroy_socket(struct sock *sk)
+static void __x25_destroy_socket(struct sock *sk)
 {
         struct sk_buff *skb;
 
-        sock_hold(sk);
-        lock_sock(sk);
         x25_stop_heartbeat(sk);
         x25_stop_timer(sk);
 
@@ -374,8 +372,7 @@ void x25_destroy_socket(struct sock *sk)
                 kfree_skb(skb);
         }
 
-        if (atomic_read(&sk->sk_wmem_alloc) ||
-            atomic_read(&sk->sk_rmem_alloc)) {
+        if (sk_has_allocations(sk)) {
                 /* Defer: outstanding buffers */
                 sk->sk_timer.expires  = jiffies + 10 * HZ;
                 sk->sk_timer.function = x25_destroy_timer;
@@ -385,7 +382,22 @@ void x25_destroy_socket(struct sock *sk)
                 /* drop last reference so sock_put will free */
                 __sock_put(sk);
         }
+}
+
+void x25_destroy_socket_from_timer(struct sock *sk)
+{
+        sock_hold(sk);
+        bh_lock_sock(sk);
+        __x25_destroy_socket(sk);
+        bh_unlock_sock(sk);
+        sock_put(sk);
+}
 
+static void x25_destroy_socket(struct sock *sk)
+{
+        sock_hold(sk);
+        lock_sock(sk);
+        __x25_destroy_socket(sk);
         release_sock(sk);
         sock_put(sk);
 }
@@ -1259,8 +1271,8 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 
         switch (cmd) {
                 case TIOCOUTQ: {
-                        int amount = sk->sk_sndbuf -
-                                     atomic_read(&sk->sk_wmem_alloc);
+                        int amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
+
                         if (amount < 0)
                                 amount = 0;
                         rc = put_user(amount, (unsigned int __user *)argp);
diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index 1afa44d25beb..0a04e62e0e18 100644
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -163,8 +163,8 @@ static int x25_seq_socket_show(struct seq_file *seq, void *v)
                    devname, x25->lci & 0x0FFF, x25->state, x25->vs, x25->vr,
                    x25->va, x25_display_timer(s) / HZ, x25->t2  / HZ,
                    x25->t21 / HZ, x25->t22 / HZ, x25->t23 / HZ,
-                   atomic_read(&s->sk_wmem_alloc),
-                   atomic_read(&s->sk_rmem_alloc),
+                   sk_wmem_alloc_get(s),
+                   sk_rmem_alloc_get(s),
                    s->sk_socket ? SOCK_INODE(s->sk_socket)->i_ino : 0L);
 out:
         return 0;
diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c
index d3e3e54db936..5c5db1a36399 100644
--- a/net/x25/x25_timer.c
+++ b/net/x25/x25_timer.c
@@ -113,7 +113,7 @@ static void x25_heartbeat_expiry(unsigned long param)
                             (sk->sk_state == TCP_LISTEN &&
                              sock_flag(sk, SOCK_DEAD))) {
                                 bh_unlock_sock(sk);
-                                x25_destroy_socket(sk);
+                                x25_destroy_socket_from_timer(sk);
                                 return;
                         }
                         break;