mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-23 21:19:04 -04:00
Merge "Merge remote-tracking branch 'remotes/origin/tmp-aefd2d632eb0' into msm-lahaina"
This commit is contained in:
commit
71c01ac3f6
1257 changed files with 13728 additions and 39772 deletions
|
|
@ -1688,6 +1688,7 @@ TRACE_EVENT(qgroup_update_reserve,
|
|||
__entry->qgid = qgroup->qgroupid;
|
||||
__entry->cur_reserved = qgroup->rsv.values[type];
|
||||
__entry->diff = diff;
|
||||
__entry->type = type;
|
||||
),
|
||||
|
||||
TP_printk_btrfs("qgid=%llu type=%s cur_reserved=%llu diff=%lld",
|
||||
|
|
@ -1710,6 +1711,7 @@ TRACE_EVENT(qgroup_meta_reserve,
|
|||
TP_fast_assign_btrfs(root->fs_info,
|
||||
__entry->refroot = root->root_key.objectid;
|
||||
__entry->diff = diff;
|
||||
__entry->type = type;
|
||||
),
|
||||
|
||||
TP_printk_btrfs("refroot=%llu(%s) type=%s diff=%lld",
|
||||
|
|
@ -1726,7 +1728,6 @@ TRACE_EVENT(qgroup_meta_convert,
|
|||
TP_STRUCT__entry_btrfs(
|
||||
__field( u64, refroot )
|
||||
__field( s64, diff )
|
||||
__field( int, type )
|
||||
),
|
||||
|
||||
TP_fast_assign_btrfs(root->fs_info,
|
||||
|
|
|
|||
|
|
@ -519,10 +519,10 @@ TRACE_EVENT(rxrpc_local,
|
|||
);
|
||||
|
||||
TRACE_EVENT(rxrpc_peer,
|
||||
TP_PROTO(struct rxrpc_peer *peer, enum rxrpc_peer_trace op,
|
||||
TP_PROTO(unsigned int peer_debug_id, enum rxrpc_peer_trace op,
|
||||
int usage, const void *where),
|
||||
|
||||
TP_ARGS(peer, op, usage, where),
|
||||
TP_ARGS(peer_debug_id, op, usage, where),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(unsigned int, peer )
|
||||
|
|
@ -532,7 +532,7 @@ TRACE_EVENT(rxrpc_peer,
|
|||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->peer = peer->debug_id;
|
||||
__entry->peer = peer_debug_id;
|
||||
__entry->op = op;
|
||||
__entry->usage = usage;
|
||||
__entry->where = where;
|
||||
|
|
@ -546,10 +546,10 @@ TRACE_EVENT(rxrpc_peer,
|
|||
);
|
||||
|
||||
TRACE_EVENT(rxrpc_conn,
|
||||
TP_PROTO(struct rxrpc_connection *conn, enum rxrpc_conn_trace op,
|
||||
TP_PROTO(unsigned int conn_debug_id, enum rxrpc_conn_trace op,
|
||||
int usage, const void *where),
|
||||
|
||||
TP_ARGS(conn, op, usage, where),
|
||||
TP_ARGS(conn_debug_id, op, usage, where),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(unsigned int, conn )
|
||||
|
|
@ -559,7 +559,7 @@ TRACE_EVENT(rxrpc_conn,
|
|||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->conn = conn->debug_id;
|
||||
__entry->conn = conn_debug_id;
|
||||
__entry->op = op;
|
||||
__entry->usage = usage;
|
||||
__entry->where = where;
|
||||
|
|
@ -606,10 +606,10 @@ TRACE_EVENT(rxrpc_client,
|
|||
);
|
||||
|
||||
TRACE_EVENT(rxrpc_call,
|
||||
TP_PROTO(struct rxrpc_call *call, enum rxrpc_call_trace op,
|
||||
TP_PROTO(unsigned int call_debug_id, enum rxrpc_call_trace op,
|
||||
int usage, const void *where, const void *aux),
|
||||
|
||||
TP_ARGS(call, op, usage, where, aux),
|
||||
TP_ARGS(call_debug_id, op, usage, where, aux),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(unsigned int, call )
|
||||
|
|
@ -620,7 +620,7 @@ TRACE_EVENT(rxrpc_call,
|
|||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->call = call->debug_id;
|
||||
__entry->call = call_debug_id;
|
||||
__entry->op = op;
|
||||
__entry->usage = usage;
|
||||
__entry->where = where;
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ TRACE_EVENT(sock_rcvqueue_full,
|
|||
TP_fast_assign(
|
||||
__entry->rmem_alloc = atomic_read(&sk->sk_rmem_alloc);
|
||||
__entry->truesize = skb->truesize;
|
||||
__entry->sk_rcvbuf = sk->sk_rcvbuf;
|
||||
__entry->sk_rcvbuf = READ_ONCE(sk->sk_rcvbuf);
|
||||
),
|
||||
|
||||
TP_printk("rmem_alloc=%d truesize=%u sk_rcvbuf=%d",
|
||||
|
|
@ -115,7 +115,7 @@ TRACE_EVENT(sock_exceed_buf_limit,
|
|||
__entry->rmem_alloc = atomic_read(&sk->sk_rmem_alloc);
|
||||
__entry->sysctl_wmem = sk_get_wmem0(sk, prot);
|
||||
__entry->wmem_alloc = refcount_read(&sk->sk_wmem_alloc);
|
||||
__entry->wmem_queued = sk->sk_wmem_queued;
|
||||
__entry->wmem_queued = READ_ONCE(sk->sk_wmem_queued);
|
||||
__entry->kind = kind;
|
||||
),
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue