diff options
| author | Linus Torvalds <[email protected]> | 2020-09-03 18:50:48 -0700 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2020-09-03 18:50:48 -0700 | 
| commit | 3e8d3bdc2a757cc6be5470297947799a7df445cc (patch) | |
| tree | fcb5dd872a7d240c0d11b1800f282ffed00d0f97 /fs/afs/proc.c | |
| parent | 8381979dfa056dee4df83d1b98740b68776ae8ac (diff) | |
| parent | b61ac5bb420adce0c9b79c6b9e1c854af083e33f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from David Miller:
 1) Use netif_rx_ni() when necessary in batman-adv stack, from Jussi
    Kivilinna.
 2) Fix loss of RTT samples in rxrpc, from David Howells.
 3) Memory leak in hns_nic_dev_probe(), from Dignhao Liu.
 4) ravb module cannot be unloaded, fix from Yuusuke Ashizuka.
 5) We disable BH for too lokng in sctp_get_port_local(), add a
    cond_resched() here as well, from Xin Long.
 6) Fix memory leak in st95hf_in_send_cmd, from Dinghao Liu.
 7) Out of bound access in bpf_raw_tp_link_fill_link_info(), from
    Yonghong Song.
 8) Missing of_node_put() in mt7530 DSA driver, from Sumera
    Priyadarsini.
 9) Fix crash in bnxt_fw_reset_task(), from Michael Chan.
10) Fix geneve tunnel checksumming bug in hns3, from Yi Li.
11) Memory leak in rxkad_verify_response, from Dinghao Liu.
12) In tipc, don't use smp_processor_id() in preemptible context. From
    Tuong Lien.
13) Fix signedness issue in mlx4 memory allocation, from Shung-Hsi Yu.
14) Missing clk_disable_prepare() in gemini driver, from Dan Carpenter.
15) Fix ABI mismatch between driver and firmware in nfp, from Louis
    Peens.
* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (110 commits)
  net/smc: fix sock refcounting in case of termination
  net/smc: reset sndbuf_desc if freed
  net/smc: set rx_off for SMCR explicitly
  net/smc: fix toleration of fake add_link messages
  tg3: Fix soft lockup when tg3_reset_task() fails.
  doc: net: dsa: Fix typo in config code sample
  net: dp83867: Fix WoL SecureOn password
  nfp: flower: fix ABI mismatch between driver and firmware
  tipc: fix shutdown() of connectionless socket
  ipv6: Fix sysctl max for fib_multipath_hash_policy
  drivers/net/wan/hdlc: Change the default of hard_header_len to 0
  net: gemini: Fix another missing clk_disable_unprepare() in probe
  net: bcmgenet: fix mask check in bcmgenet_validate_flow()
  amd-xgbe: Add support for new port mode
  net: usb: dm9601: Add USB ID of Keenetic Plus DSL
  vhost: fix typo in error message
  net: ethernet: mlx4: Fix memory allocation in mlx4_buddy_init()
  pktgen: fix error message with wrong function name
  net: ethernet: ti: am65-cpsw: fix rmii 100Mbit link mode
  cxgb4: fix thermal zone device registration
  ...
Diffstat (limited to 'fs/afs/proc.c')
| -rw-r--r-- | fs/afs/proc.c | 5 | 
1 files changed, 5 insertions, 0 deletions
| diff --git a/fs/afs/proc.c b/fs/afs/proc.c index e817fc740ba0..e8babb62ed44 100644 --- a/fs/afs/proc.c +++ b/fs/afs/proc.c @@ -310,6 +310,11 @@ static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v)  				   alist->preferred == i ? '>' : '-',  				   &alist->addrs[i].transport);  	} +	seq_printf(m, " info: fl=%lx rtt=%d\n", vlserver->flags, vlserver->rtt); +	seq_printf(m, " probe: fl=%x e=%d ac=%d out=%d\n", +		   vlserver->probe.flags, vlserver->probe.error, +		   vlserver->probe.abort_code, +		   atomic_read(&vlserver->probe_outstanding));  	return 0;  } |