mptcp: open code mptcp variant for lock_sock

[linux-2.6-microblaze.git] / net / mptcp / protocol.h

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 82d5626..6abac82 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -253,6 +253,19 @@ struct mptcp_sock {
        } rcvq_space;
 };
 
+#define mptcp_lock_sock(___sk, cb) do {                                        \
+       struct sock *__sk = (___sk); /* silence macro reuse warning */  \
+       might_sleep();                                                  \
+       spin_lock_bh(&__sk->sk_lock.slock);                             \
+       if (__sk->sk_lock.owned)                                        \
+               __lock_sock(__sk);                                      \
+       cb;                                                             \
+       __sk->sk_lock.owned = 1;                                        \
+       spin_unlock(&__sk->sk_lock.slock);                              \
+       mutex_acquire(&__sk->sk_lock.dep_map, 0, 0, _RET_IP_);          \
+       local_bh_enable();                                              \
+} while (0)
+
 #define mptcp_for_each_subflow(__msk, __subflow)                       \
        list_for_each_entry(__subflow, &((__msk)->conn_list), node)