diff options
| author |   Shyam Prasad N <sprasad@microsoft.com> | 2021-07-19 10:54:46 +0000 |
|---|---|---|
| committer |   Steve French <stfrench@microsoft.com> | 2021-11-12 16:22:20 -0600 |
| commit | 724244cdb3828522109c88e56a0242537aefabe9 (patch) | |
| tree | 59f14fbd73adcbb3b89fc822d24b99f47883ea67 /fs/cifs/cifsglob.h | |
| parent | cifs: do not negotiate session if session already exists (diff) | |
| download | linux-dev-724244cdb3828522109c88e56a0242537aefabe9.tar.xz linux-dev-724244cdb3828522109c88e56a0242537aefabe9.zip | |
cifs: protect session channel fields with chan_lock
Introducing a new spin lock to protect all the channel related
fields in a cifs_ses struct. This lock should be taken
whenever dealing with the channel fields, and should be held
only for very short intervals which will not sleep.
Currently, all channel related fields in cifs_ses structure
are protected by session_mutex. However, this mutex is held for
long periods (sometimes while waiting for a reply from server).
This makes the codepath quite tricky to change.
Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 673ecbfe6d9a..3c18c56a119b 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -952,16 +952,21 @@ struct cifs_ses { * iface_lock should be taken when accessing any of these fields */ spinlock_t iface_lock; + /* ========= begin: protected by iface_lock ======== */ struct cifs_server_iface *iface_list; size_t iface_count; unsigned long iface_last_update; /* jiffies */ + /* ========= end: protected by iface_lock ======== */ + spinlock_t chan_lock; + /* ========= begin: protected by chan_lock ======== */ #define CIFS_MAX_CHANNELS 16 struct cifs_chan chans[CIFS_MAX_CHANNELS]; struct cifs_chan *binding_chan; size_t chan_count; size_t chan_max; atomic_t chan_seq; /* round robin state */ + /* ========= end: protected by chan_lock ======== */ }; /* |