diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 09:07:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 09:07:15 -0700 |
| commit | 1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5 (patch) | |
| tree | c6684be0e98deb7220153c410be7c1fb7cb0dbbf /fs/cifs/cifs_debug.c | |
| parent | f63d395d47f37a4fe771e6d4b1db9d2cdae5ffc5 (diff) | |
| parent | 3dd933061d3a4f33fb6ba1616e88fa55a8b8cb9c (diff) | |
| download | op-kernel-dev-1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5.zip op-kernel-dev-1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5.tar.gz | |
Merge git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French
* git://git.samba.org/sfrench/cifs-2.6:
cifs: clean up ordering in exit_cifs
cifs: clean up call to cifs_dfs_release_automount_timer()
CIFS: Delete echo_retries module parm
CIFS: Prepare credits code for a slot reservation
CIFS: Make wait_for_free_request killable
CIFS: Introduce credit-based flow control
CIFS: Simplify inFlight logic
cifs: fix issue mounting of DFS ROOT when redirecting from one domain controller to the next
CIFS: Respect negotiated MaxMpxCount
CIFS: Fix a spurious error in cifs_push_posix_locks
Diffstat (limited to 'fs/cifs/cifs_debug.c')
| -rw-r--r-- | fs/cifs/cifs_debug.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c index 24b3dfc..573b899 100644 --- a/fs/cifs/cifs_debug.c +++ b/fs/cifs/cifs_debug.c @@ -171,8 +171,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) seq_printf(m, "TCP status: %d\n\tLocal Users To " "Server: %d SecMode: 0x%x Req On Wire: %d", server->tcpStatus, server->srv_count, - server->sec_mode, - atomic_read(&server->inFlight)); + server->sec_mode, in_flight(server)); #ifdef CONFIG_CIFS_STATS2 seq_printf(m, " In Send: %d In MaxReq Wait: %d", |
