diff options
| author | Enzo Matsumiya <ematsumiya@suse.de> | 2024-11-13 17:41:47 -0300 |
|---|---|---|
| committer | Enzo Matsumiya <ematsumiya@suse.de> | 2024-11-13 17:56:31 -0300 |
| commit | 03112dbb54a34526f592d3fa5fa2054ca253d919 (patch) | |
| tree | 51fb20fb90a73c9ef131aab6acacb36e37707170 | |
| parent | e61bd08d63453bee6c440c9bd350bbed5cac98f8 (diff) | |
| download | linux-03112dbb54a34526f592d3fa5fa2054ca253d919.tar.gz linux-03112dbb54a34526f592d3fa5fa2054ca253d919.tar.bz2 linux-03112dbb54a34526f592d3fa5fa2054ca253d919.zip | |
smb: client: remove some leftover bits from SMB1 code
Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
| -rw-r--r-- | fs/smb/client/inode.c | 5 | ||||
| -rw-r--r-- | fs/smb/client/reparse.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c index 234835e70bb1..54e987992e42 100644 --- a/fs/smb/client/inode.c +++ b/fs/smb/client/inode.c @@ -914,7 +914,6 @@ static int cifs_get_fattr(struct cifs_open_info_data *data, struct TCP_Server_Info *server; struct tcon_link *tlink; struct cifs_sb_info *cifs_sb = CIFS_SB(sb); - void *smb1_backup_rsp_buf = NULL; int rc = 0; int tmprc = 0; @@ -929,8 +928,7 @@ static int cifs_get_fattr(struct cifs_open_info_data *data, */ if (!data) { - rc = smb2_query_path_info(xid, tcon, cifs_sb, - full_path, &tmp_data); + rc = smb2_query_path_info(xid, tcon, cifs_sb, full_path, &tmp_data); data = &tmp_data; } @@ -1022,7 +1020,6 @@ static int cifs_get_fattr(struct cifs_open_info_data *data, } out: - cifs_buf_release(smb1_backup_rsp_buf); cifs_put_tlink(tlink); cifs_free_open_info(&tmp_data); return rc; diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c index 4ba9eb4a1ae5..47a9aac30443 100644 --- a/fs/smb/client/reparse.c +++ b/fs/smb/client/reparse.c @@ -718,11 +718,13 @@ bool cifs_reparse_point_to_fattr(struct cifs_sb_info *cifs_sb, case IO_REPARSE_TAG_LX_BLK: wsl_to_fattr(data, cifs_sb, tag, fattr); break; - case 0: /* SMB1 symlink */ case IO_REPARSE_TAG_SYMLINK: case IO_REPARSE_TAG_NFS: fattr->cf_mode |= S_IFLNK; break; + case 0: /* SMB1 symlink */ + pr_warn_once("%s: SMB 1.0 is no longer supported\n", __func__); + fallthrough; default: return false; } |