* [PATCH AUTOSEL 6.1 09/14] smb: client: Fix minor whitespace errors and warnings [not found] <20240116010642.218876-1-sashal@kernel.org> @ 2024-01-16 1:06 ` Sasha Levin 2024-01-16 20:48 ` Pavel Machek 0 siblings, 1 reply; 2+ messages in thread From: Sasha Levin @ 2024-01-16 1:06 UTC (permalink / raw) To: linux-kernel, stable Cc: Pierre Mariani, Steve French, Sasha Levin, sfrench, linux-cifs, samba-technical From: Pierre Mariani <pierre.mariani@gmail.com> [ Upstream commit 0108ce08aed195d200ffbad74c1948bbaefe6625 ] Fixes no-op checkpatch errors and warnings. Signed-off-by: Pierre Mariani <pierre.mariani@gmail.com> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- fs/smb/client/connect.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c index f725a119ce31..a957efaa5e74 100644 --- a/fs/smb/client/connect.c +++ b/fs/smb/client/connect.c @@ -505,6 +505,7 @@ static int reconnect_dfs_server(struct TCP_Server_Info *server) { int rc = 0; const char *refpath = server->current_fullpath + 1; + struct dfs_cache_tgt_list tl = DFS_CACHE_TGT_LIST_INIT(tl); struct dfs_cache_tgt_iterator *target_hint = NULL; int num_targets = 0; @@ -773,6 +774,7 @@ cifs_read_from_socket(struct TCP_Server_Info *server, char *buf, { struct msghdr smb_msg = {}; struct kvec iov = {.iov_base = buf, .iov_len = to_read}; + iov_iter_kvec(&smb_msg.msg_iter, ITER_DEST, &iov, 1, to_read); return cifs_readv_from_socket(server, &smb_msg); @@ -1412,11 +1414,13 @@ cifs_match_ipaddr(struct sockaddr *srcaddr, struct sockaddr *rhs) case AF_INET: { struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; struct sockaddr_in *vaddr4 = (struct sockaddr_in *)rhs; + return (saddr4->sin_addr.s_addr == vaddr4->sin_addr.s_addr); } case AF_INET6: { struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)rhs; + return ipv6_addr_equal(&saddr6->sin6_addr, &vaddr6->sin6_addr); } default: @@ -2588,8 +2592,8 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb3_fs_context *ctx) rc = -EOPNOTSUPP; goto out_fail; } else { - cifs_dbg(VFS, "Check vers= mount option. SMB3.11 " - "disabled but required for POSIX extensions\n"); + cifs_dbg(VFS, + "Check vers= mount option. SMB3.11 disabled but required for POSIX extensions\n"); rc = -EOPNOTSUPP; goto out_fail; } @@ -2733,7 +2737,6 @@ cifs_put_tlink(struct tcon_link *tlink) if (!IS_ERR(tlink_tcon(tlink))) cifs_put_tcon(tlink_tcon(tlink)); kfree(tlink); - return; } static int @@ -2867,6 +2870,7 @@ static inline void cifs_reclassify_socket4(struct socket *sock) { struct sock *sk = sock->sk; + BUG_ON(!sock_allow_reclassification(sk)); sock_lock_init_class_and_name(sk, "slock-AF_INET-CIFS", &cifs_slock_key[0], "sk_lock-AF_INET-CIFS", &cifs_key[0]); @@ -2876,6 +2880,7 @@ static inline void cifs_reclassify_socket6(struct socket *sock) { struct sock *sk = sock->sk; + BUG_ON(!sock_allow_reclassification(sk)); sock_lock_init_class_and_name(sk, "slock-AF_INET6-CIFS", &cifs_slock_key[1], "sk_lock-AF_INET6-CIFS", &cifs_key[1]); @@ -2910,15 +2915,18 @@ static int bind_socket(struct TCP_Server_Info *server) { int rc = 0; + if (server->srcaddr.ss_family != AF_UNSPEC) { /* Bind to the specified local IP address */ struct socket *socket = server->ssocket; + rc = kernel_bind(socket, (struct sockaddr *) &server->srcaddr, sizeof(server->srcaddr)); if (rc < 0) { struct sockaddr_in *saddr4; struct sockaddr_in6 *saddr6; + saddr4 = (struct sockaddr_in *)&server->srcaddr; saddr6 = (struct sockaddr_in6 *)&server->srcaddr; if (saddr6->sin6_family == AF_INET6) @@ -3146,6 +3154,7 @@ void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon, if (!CIFSSMBQFSUnixInfo(xid, tcon)) { __u64 cap = le64_to_cpu(tcon->fsUnixInfo.Capability); + cifs_dbg(FYI, "unix caps which server supports %lld\n", cap); /* * check for reconnect case in which we do not @@ -3997,7 +4006,7 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses, smb_buffer_response = smb_buffer; header_assemble(smb_buffer, SMB_COM_TREE_CONNECT_ANDX, - NULL /*no tid */ , 4 /*wct */ ); + NULL /*no tid */, 4 /*wct */); smb_buffer->Mid = get_next_mid(ses->server); smb_buffer->Uid = ses->Suid; @@ -4016,12 +4025,12 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses, if (ses->server->sign) smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; - if (ses->capabilities & CAP_STATUS32) { + if (ses->capabilities & CAP_STATUS32) smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS; - } - if (ses->capabilities & CAP_DFS) { + + if (ses->capabilities & CAP_DFS) smb_buffer->Flags2 |= SMBFLG2_DFS; - } + if (ses->capabilities & CAP_UNICODE) { smb_buffer->Flags2 |= SMBFLG2_UNICODE; length = -- 2.43.0 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH AUTOSEL 6.1 09/14] smb: client: Fix minor whitespace errors and warnings 2024-01-16 1:06 ` [PATCH AUTOSEL 6.1 09/14] smb: client: Fix minor whitespace errors and warnings Sasha Levin @ 2024-01-16 20:48 ` Pavel Machek 0 siblings, 0 replies; 2+ messages in thread From: Pavel Machek @ 2024-01-16 20:48 UTC (permalink / raw) To: Sasha Levin Cc: linux-kernel, stable, Pierre Mariani, Steve French, sfrench, linux-cifs, samba-technical [-- Attachment #1: Type: text/plain, Size: 4822 bytes --] Hi! > [ Upstream commit 0108ce08aed195d200ffbad74c1948bbaefe6625 ] > > Fixes no-op checkpatch errors and warnings. Why did AUTOSEL pick this? It should not be picking whitespace changes. BR, Pavel > index f725a119ce31..a957efaa5e74 100644 > --- a/fs/smb/client/connect.c > +++ b/fs/smb/client/connect.c > @@ -505,6 +505,7 @@ static int reconnect_dfs_server(struct TCP_Server_Info *server) > { > int rc = 0; > const char *refpath = server->current_fullpath + 1; > + > struct dfs_cache_tgt_list tl = DFS_CACHE_TGT_LIST_INIT(tl); > struct dfs_cache_tgt_iterator *target_hint = NULL; > int num_targets = 0; > @@ -773,6 +774,7 @@ cifs_read_from_socket(struct TCP_Server_Info *server, char *buf, > { > struct msghdr smb_msg = {}; > struct kvec iov = {.iov_base = buf, .iov_len = to_read}; > + > iov_iter_kvec(&smb_msg.msg_iter, ITER_DEST, &iov, 1, to_read); > > return cifs_readv_from_socket(server, &smb_msg); > @@ -1412,11 +1414,13 @@ cifs_match_ipaddr(struct sockaddr *srcaddr, struct sockaddr *rhs) > case AF_INET: { > struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; > struct sockaddr_in *vaddr4 = (struct sockaddr_in *)rhs; > + > return (saddr4->sin_addr.s_addr == vaddr4->sin_addr.s_addr); > } > case AF_INET6: { > struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; > struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)rhs; > + > return ipv6_addr_equal(&saddr6->sin6_addr, &vaddr6->sin6_addr); > } > default: > @@ -2588,8 +2592,8 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb3_fs_context *ctx) > rc = -EOPNOTSUPP; > goto out_fail; > } else { > - cifs_dbg(VFS, "Check vers= mount option. SMB3.11 " > - "disabled but required for POSIX extensions\n"); > + cifs_dbg(VFS, > + "Check vers= mount option. SMB3.11 disabled but required for POSIX extensions\n"); > rc = -EOPNOTSUPP; > goto out_fail; > } > @@ -2733,7 +2737,6 @@ cifs_put_tlink(struct tcon_link *tlink) > if (!IS_ERR(tlink_tcon(tlink))) > cifs_put_tcon(tlink_tcon(tlink)); > kfree(tlink); > - return; > } > > static int > @@ -2867,6 +2870,7 @@ static inline void > cifs_reclassify_socket4(struct socket *sock) > { > struct sock *sk = sock->sk; > + > BUG_ON(!sock_allow_reclassification(sk)); > sock_lock_init_class_and_name(sk, "slock-AF_INET-CIFS", > &cifs_slock_key[0], "sk_lock-AF_INET-CIFS", &cifs_key[0]); > @@ -2876,6 +2880,7 @@ static inline void > cifs_reclassify_socket6(struct socket *sock) > { > struct sock *sk = sock->sk; > + > BUG_ON(!sock_allow_reclassification(sk)); > sock_lock_init_class_and_name(sk, "slock-AF_INET6-CIFS", > &cifs_slock_key[1], "sk_lock-AF_INET6-CIFS", &cifs_key[1]); > @@ -2910,15 +2915,18 @@ static int > bind_socket(struct TCP_Server_Info *server) > { > int rc = 0; > + > if (server->srcaddr.ss_family != AF_UNSPEC) { > /* Bind to the specified local IP address */ > struct socket *socket = server->ssocket; > + > rc = kernel_bind(socket, > (struct sockaddr *) &server->srcaddr, > sizeof(server->srcaddr)); > if (rc < 0) { > struct sockaddr_in *saddr4; > struct sockaddr_in6 *saddr6; > + > saddr4 = (struct sockaddr_in *)&server->srcaddr; > saddr6 = (struct sockaddr_in6 *)&server->srcaddr; > if (saddr6->sin6_family == AF_INET6) > @@ -3146,6 +3154,7 @@ void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon, > > if (!CIFSSMBQFSUnixInfo(xid, tcon)) { > __u64 cap = le64_to_cpu(tcon->fsUnixInfo.Capability); > + > cifs_dbg(FYI, "unix caps which server supports %lld\n", cap); > /* > * check for reconnect case in which we do not > @@ -3997,7 +4006,7 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses, > smb_buffer_response = smb_buffer; > > header_assemble(smb_buffer, SMB_COM_TREE_CONNECT_ANDX, > - NULL /*no tid */ , 4 /*wct */ ); > + NULL /*no tid */, 4 /*wct */); > > smb_buffer->Mid = get_next_mid(ses->server); > smb_buffer->Uid = ses->Suid; > @@ -4016,12 +4025,12 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses, > if (ses->server->sign) > smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; > > - if (ses->capabilities & CAP_STATUS32) { > + if (ses->capabilities & CAP_STATUS32) > smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS; > - } > - if (ses->capabilities & CAP_DFS) { > + > + if (ses->capabilities & CAP_DFS) > smb_buffer->Flags2 |= SMBFLG2_DFS; > - } > + > if (ses->capabilities & CAP_UNICODE) { > smb_buffer->Flags2 |= SMBFLG2_UNICODE; > length = -- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-16 20:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20240116010642.218876-1-sashal@kernel.org>
2024-01-16 1:06 ` [PATCH AUTOSEL 6.1 09/14] smb: client: Fix minor whitespace errors and warnings Sasha Levin
2024-01-16 20:48 ` Pavel Machek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox