diff options
| author | Henrique Carvalho <henrique.carvalho@suse.com> | 2024-11-14 15:18:21 -0300 |
|---|---|---|
| committer | Henrique Carvalho <henrique.carvalho@suse.com> | 2024-11-14 15:54:42 -0300 |
| commit | 901faf55139e52654601461dd9b2954b7c701c42 (patch) | |
| tree | d8ae0aec7d6ca5ad549d13f6be7a40cf18c9f980 | |
| parent | f8b99f5fc63d0ec27321537de963e8a3e0ba7835 (diff) | |
| download | linux-901faf55139e52654601461dd9b2954b7c701c42.tar.gz linux-901faf55139e52654601461dd9b2954b7c701c42.tar.bz2 linux-901faf55139e52654601461dd9b2954b7c701c42.zip | |
smb: client: remove ->dump_share_caps op
Replace for the existing function smb2_dump_share_caps.
Signed-off-by: Henrique Carvalho <henrique.carvalho@suse.com>
| -rw-r--r-- | fs/smb/client/cifs_debug.c | 3 | ||||
| -rw-r--r-- | fs/smb/client/cifsglob.h | 2 | ||||
| -rw-r--r-- | fs/smb/client/smb2ops.c | 4 | ||||
| -rw-r--r-- | fs/smb/client/smb2proto.h | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/fs/smb/client/cifs_debug.c b/fs/smb/client/cifs_debug.c index e58291e4a83f..88e43e53a8a0 100644 --- a/fs/smb/client/cifs_debug.c +++ b/fs/smb/client/cifs_debug.c @@ -116,8 +116,7 @@ static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon) seq_printf(m, " nocase"); if (tcon->unix_ext) seq_printf(m, " POSIX Extensions"); - if (tcon->ses->server->ops->dump_share_caps) - tcon->ses->server->ops->dump_share_caps(m, tcon); + smb2_dump_share_caps(m, tcon); if (tcon->use_witness) seq_puts(m, " Witness"); if (tcon->broken_sparse_sup) diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h index d1eea3ff133b..e861987894ea 100644 --- a/fs/smb/client/cifsglob.h +++ b/fs/smb/client/cifsglob.h @@ -274,8 +274,6 @@ struct cifs_open_parms; struct cifs_credits; struct smb_version_operations { - /* find mid corresponding to the response message */ - void (*dump_share_caps)(struct seq_file *, struct cifs_tcon *); /* verify the message */ void (*downgrade_oplock)(struct TCP_Server_Info *server, struct cifsInodeInfo *cinode, __u32 oplock, diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c index 78a73939094e..03eb706140ba 100644 --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -1296,7 +1296,7 @@ void smb2_clear_stats(struct cifs_tcon *tcon) } } -static void +void smb2_dump_share_caps(struct seq_file *m, struct cifs_tcon *tcon) { seq_puts(m, "\n\tShare Capabilities:"); @@ -5030,7 +5030,6 @@ struct smb_version_operations smb21_operations = { }; struct smb_version_operations smb30_operations = { - .dump_share_caps = smb2_dump_share_caps, .downgrade_oplock = smb3_downgrade_oplock, .negotiate_wsize = smb3_negotiate_wsize, .negotiate_rsize = smb3_negotiate_rsize, @@ -5049,7 +5048,6 @@ struct smb_version_operations smb30_operations = { }; struct smb_version_operations smb311_operations = { - .dump_share_caps = smb2_dump_share_caps, .downgrade_oplock = smb3_downgrade_oplock, .negotiate_wsize = smb3_negotiate_wsize, .negotiate_rsize = smb3_negotiate_rsize, diff --git a/fs/smb/client/smb2proto.h b/fs/smb/client/smb2proto.h index a7a72bb38ac1..8f8e5751f9b9 100644 --- a/fs/smb/client/smb2proto.h +++ b/fs/smb/client/smb2proto.h @@ -164,6 +164,7 @@ extern void smb2_set_replay(struct TCP_Server_Info *server, extern bool smb2_should_replay(struct cifs_tcon *tcon, int *pretries, int *pcur_sleep); +extern void smb2_dump_share_caps(struct seq_file *m, struct cifs_tcon *tcon); /* * SMB2 Worker functions - most of protocol specific implementation details |