| Message ID | 20241107164029.322205-1-marco.crivellari@suse.com |
|---|---|
| State | New |
| Headers | show |
| Series | Update misleading comment in cifs_chan_update_iface | expand |
On 11/07, Marco Crivellari wrote: >Since commit 8da33fd11c05 ("cifs: avoid deadlocks while updating iface") >cifs_chan_update_iface now takes the chan_lock itself, so update the >comment accordingly. > >Signed-off-by: Marco Crivellari <marco.crivellari@suse.com> >--- > fs/smb/client/sess.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > >diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c >index 3216f786908f..51614a36a100 100644 >--- a/fs/smb/client/sess.c >+++ b/fs/smb/client/sess.c >@@ -359,10 +359,7 @@ cifs_disable_secondary_channels(struct cifs_ses *ses) > spin_unlock(&ses->chan_lock); > } > >-/* >- * update the iface for the channel if necessary. >- * Must be called with chan_lock held. >- */ >+/* update the iface for the channel if necessary. */ > void > cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server) > { >-- Reviewed-by: Enzo Matsumiya <ematsumiya@suse.de> Cheers
added to cifs-2.6.git for-next (and added the RB to the other three a well) On Mon, Nov 25, 2024 at 9:58 AM Enzo Matsumiya <ematsumiya@suse.de> wrote: > > On 11/07, Marco Crivellari wrote: > >Since commit 8da33fd11c05 ("cifs: avoid deadlocks while updating iface") > >cifs_chan_update_iface now takes the chan_lock itself, so update the > >comment accordingly. > > > >Signed-off-by: Marco Crivellari <marco.crivellari@suse.com> > >--- > > fs/smb/client/sess.c | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > >diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c > >index 3216f786908f..51614a36a100 100644 > >--- a/fs/smb/client/sess.c > >+++ b/fs/smb/client/sess.c > >@@ -359,10 +359,7 @@ cifs_disable_secondary_channels(struct cifs_ses *ses) > > spin_unlock(&ses->chan_lock); > > } > > > >-/* > >- * update the iface for the channel if necessary. > >- * Must be called with chan_lock held. > >- */ > >+/* update the iface for the channel if necessary. */ > > void > > cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server) > > { > >-- > > Reviewed-by: Enzo Matsumiya <ematsumiya@suse.de> > > > Cheers
Thank you, Marco On Mon, Nov 25, 2024 at 9:07 PM Steve French <smfrench@gmail.com> wrote: > > added to cifs-2.6.git for-next (and added the RB to the other three a well) > > On Mon, Nov 25, 2024 at 9:58 AM Enzo Matsumiya <ematsumiya@suse.de> wrote: > > > > On 11/07, Marco Crivellari wrote: > > >Since commit 8da33fd11c05 ("cifs: avoid deadlocks while updating iface") > > >cifs_chan_update_iface now takes the chan_lock itself, so update the > > >comment accordingly. > > > > > >Signed-off-by: Marco Crivellari <marco.crivellari@suse.com> > > >--- > > > fs/smb/client/sess.c | 5 +---- > > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > > >diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c > > >index 3216f786908f..51614a36a100 100644 > > >--- a/fs/smb/client/sess.c > > >+++ b/fs/smb/client/sess.c > > >@@ -359,10 +359,7 @@ cifs_disable_secondary_channels(struct cifs_ses *ses) > > > spin_unlock(&ses->chan_lock); > > > } > > > > > >-/* > > >- * update the iface for the channel if necessary. > > >- * Must be called with chan_lock held. > > >- */ > > >+/* update the iface for the channel if necessary. */ > > > void > > > cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server) > > > { > > >-- > > > > Reviewed-by: Enzo Matsumiya <ematsumiya@suse.de> > > > > > > Cheers > > > > -- > Thanks, > > Steve
diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c index 3216f786908f..51614a36a100 100644 --- a/fs/smb/client/sess.c +++ b/fs/smb/client/sess.c @@ -359,10 +359,7 @@ cifs_disable_secondary_channels(struct cifs_ses *ses) spin_unlock(&ses->chan_lock); } -/* - * update the iface for the channel if necessary. - * Must be called with chan_lock held. - */ +/* update the iface for the channel if necessary. */ void cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server) {
Since commit 8da33fd11c05 ("cifs: avoid deadlocks while updating iface") cifs_chan_update_iface now takes the chan_lock itself, so update the comment accordingly. Signed-off-by: Marco Crivellari <marco.crivellari@suse.com> --- fs/smb/client/sess.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)