| Message ID | b8c930087bbe9f2a4771e9b5a007fd0208cd1b6c.1701060106.git.pierre.mariani@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] smb: client: Delete unused value | expand |
patch looks fine other than a trivial checkpatch warning (I corrected).
Although trivial style changes - they look non-controversial and small
$ ./scripts/checkpatch.pl
0001-smb-client-Fix-checkpatch-whitespace-errors-and-warn.patch
WARNING: A patch subject line should describe the change not the tool
that found it
#4:
Subject: [PATCH] smb: client: Fix checkpatch whitespace errors and warnings
total: 0 errors, 1 warnings, 107 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
0001-smb-client-Fix-checkpatch-whitespace-errors-and-warn.patch has
style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
On Sun, Nov 26, 2023 at 10:52 PM Pierre Mariani
<pierre.mariani@gmail.com> wrote:
>
> Fixes no-op checkpatch errors and warnings.
>
> Signed-off-by: Pierre Mariani <pierre.mariani@gmail.com>
> ---
> 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 a381c4cdb8c4..59f95ea5105e 100644
> --- a/fs/smb/client/connect.c
> +++ b/fs/smb/client/connect.c
> @@ -482,6 +482,7 @@ static int reconnect_target_unlocked(struct TCP_Server_Info *server, struct dfs_
> static int reconnect_dfs_server(struct TCP_Server_Info *server)
> {
> struct dfs_cache_tgt_iterator *target_hint = NULL;
> +
> DFS_CACHE_TGT_LIST(tl);
> int num_targets = 0;
> int rc = 0;
> @@ -750,6 +751,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);
> @@ -1400,11 +1402,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)
> && saddr6->sin6_scope_id == vaddr6->sin6_scope_id);
> }
> @@ -2605,8 +2609,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;
> }
> @@ -2751,7 +2755,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
> @@ -2892,6 +2895,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]);
> @@ -2901,6 +2905,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]);
> @@ -2935,15 +2940,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)
> @@ -3173,6 +3181,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
> @@ -3676,7 +3685,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;
> @@ -3695,12 +3704,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.39.2
>
diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c index a381c4cdb8c4..59f95ea5105e 100644 --- a/fs/smb/client/connect.c +++ b/fs/smb/client/connect.c @@ -482,6 +482,7 @@ static int reconnect_target_unlocked(struct TCP_Server_Info *server, struct dfs_ static int reconnect_dfs_server(struct TCP_Server_Info *server) { struct dfs_cache_tgt_iterator *target_hint = NULL; + DFS_CACHE_TGT_LIST(tl); int num_targets = 0; int rc = 0; @@ -750,6 +751,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); @@ -1400,11 +1402,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) && saddr6->sin6_scope_id == vaddr6->sin6_scope_id); } @@ -2605,8 +2609,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; } @@ -2751,7 +2755,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 @@ -2892,6 +2895,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]); @@ -2901,6 +2905,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]); @@ -2935,15 +2940,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) @@ -3173,6 +3181,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 @@ -3676,7 +3685,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; @@ -3695,12 +3704,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 =
Fixes no-op checkpatch errors and warnings. Signed-off-by: Pierre Mariani <pierre.mariani@gmail.com> --- fs/smb/client/connect.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)