| Message ID | 20220718180421.49697-1-justinstitt@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] target: iscsi: fix clang -Wformat warnings | expand |
On Mon, Jul 18, 2022 at 11:04 AM Justin Stitt <justinstitt@google.com> wrote: > > When building with Clang we encounter these warnings: > | drivers/target/iscsi/iscsi_target_login.c:719:24: error: format > | specifies type 'unsigned short' but the argument has type 'int' > | [-Werror,-Wformat] " from node: %s\n", atomic_read(&sess->nconn), > - > | drivers/target/iscsi/iscsi_target_login.c:767:12: error: format > | specifies type 'unsigned short' but the argument has type 'int' > | [-Werror,-Wformat] " %s\n", atomic_read(&sess->nconn), > - > | drivers/target/iscsi/iscsi_target.c:4365:12: error: format specifies > | type 'unsigned short' but the argument has type 'int' [-Werror,-Wformat] > | " %s\n", atomic_read(&sess->nconn) > > For all warnings, the format specifier is `%hu` which describes an > unsigned short. The resulting type of atomic_read is an int. The > proposed fix is to listen to Clang and swap the format specifier. > > Link: https://github.com/ClangBuiltLinux/linux/issues/378 > Signed-off-by: Justin Stitt <justinstitt@google.com> Thanks for the patch! Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > --- > diff from v1->v2: > Combined two similar patches into one: > * https://lore.kernel.org/all/20220708221314.466294-1-justinstitt@google.com/ > * https://lore.kernel.org/llvm/20220708211447.135209-1-justinstitt@google.com/ > > drivers/target/iscsi/iscsi_target.c | 2 +- > drivers/target/iscsi/iscsi_target_login.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c > index e368f038ff5c..bfb717065344 100644 > --- a/drivers/target/iscsi/iscsi_target.c > +++ b/drivers/target/iscsi/iscsi_target.c > @@ -4361,7 +4361,7 @@ int iscsit_close_connection( > > spin_lock_bh(&sess->conn_lock); > atomic_dec(&sess->nconn); > - pr_debug("Decremented iSCSI connection count to %hu from node:" > + pr_debug("Decremented iSCSI connection count to %d from node:" > " %s\n", atomic_read(&sess->nconn), > sess->sess_ops->InitiatorName); > /* > diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c > index 6b94eecc4790..0778591abae7 100644 > --- a/drivers/target/iscsi/iscsi_target_login.c > +++ b/drivers/target/iscsi/iscsi_target_login.c > @@ -715,7 +715,7 @@ void iscsi_post_login_handler( > > list_add_tail(&conn->conn_list, &sess->sess_conn_list); > atomic_inc(&sess->nconn); > - pr_debug("Incremented iSCSI Connection count to %hu" > + pr_debug("Incremented iSCSI Connection count to %d" > " from node: %s\n", atomic_read(&sess->nconn), > sess->sess_ops->InitiatorName); > spin_unlock_bh(&sess->conn_lock); > @@ -763,7 +763,7 @@ void iscsi_post_login_handler( > spin_lock_bh(&sess->conn_lock); > list_add_tail(&conn->conn_list, &sess->sess_conn_list); > atomic_inc(&sess->nconn); > - pr_debug("Incremented iSCSI Connection count to %hu from node:" > + pr_debug("Incremented iSCSI Connection count to %d from node:" > " %s\n", atomic_read(&sess->nconn), > sess->sess_ops->InitiatorName); > spin_unlock_bh(&sess->conn_lock); > -- > 2.37.0.170.g444d1eabd0-goog >
On 7/18/22 11:04, Justin Stitt wrote: > When building with Clang we encounter these warnings: > | drivers/target/iscsi/iscsi_target_login.c:719:24: error: format > | specifies type 'unsigned short' but the argument has type 'int' > | [-Werror,-Wformat] " from node: %s\n", atomic_read(&sess->nconn), > - > | drivers/target/iscsi/iscsi_target_login.c:767:12: error: format > | specifies type 'unsigned short' but the argument has type 'int' > | [-Werror,-Wformat] " %s\n", atomic_read(&sess->nconn), > - > | drivers/target/iscsi/iscsi_target.c:4365:12: error: format specifies > | type 'unsigned short' but the argument has type 'int' [-Werror,-Wformat] > | " %s\n", atomic_read(&sess->nconn) > > For all warnings, the format specifier is `%hu` which describes an > unsigned short. The resulting type of atomic_read is an int. The > proposed fix is to listen to Clang and swap the format specifier. > > Link: https://github.com/ClangBuiltLinux/linux/issues/378 > Signed-off-by: Justin Stitt <justinstitt@google.com> Looks good. Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> -ck
Justin, > For all warnings, the format specifier is `%hu` which describes an > unsigned short. The resulting type of atomic_read is an int. The > proposed fix is to listen to Clang and swap the format specifier. Applied to 5.20/scsi-staging, thanks!
On Mon, 18 Jul 2022 11:04:21 -0700, Justin Stitt wrote: > When building with Clang we encounter these warnings: > | drivers/target/iscsi/iscsi_target_login.c:719:24: error: format > | specifies type 'unsigned short' but the argument has type 'int' > | [-Werror,-Wformat] " from node: %s\n", atomic_read(&sess->nconn), > - > | drivers/target/iscsi/iscsi_target_login.c:767:12: error: format > | specifies type 'unsigned short' but the argument has type 'int' > | [-Werror,-Wformat] " %s\n", atomic_read(&sess->nconn), > - > | drivers/target/iscsi/iscsi_target.c:4365:12: error: format specifies > | type 'unsigned short' but the argument has type 'int' [-Werror,-Wformat] > | " %s\n", atomic_read(&sess->nconn) > > [...] Applied to 5.20/scsi-queue, thanks! [1/1] target: iscsi: fix clang -Wformat warnings https://git.kernel.org/mkp/scsi/c/71b25693b22e
diff from v1->v2: Combined two similar patches into one: * https://lore.kernel.org/all/20220708221314.466294-1-justinstitt@google.com/ * https://lore.kernel.org/llvm/20220708211447.135209-1-justinstitt@google.com/ drivers/target/iscsi/iscsi_target.c | 2 +- drivers/target/iscsi/iscsi_target_login.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index e368f038ff5c..bfb717065344 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -4361,7 +4361,7 @@ int iscsit_close_connection( spin_lock_bh(&sess->conn_lock); atomic_dec(&sess->nconn); - pr_debug("Decremented iSCSI connection count to %hu from node:" + pr_debug("Decremented iSCSI connection count to %d from node:" " %s\n", atomic_read(&sess->nconn), sess->sess_ops->InitiatorName); /* diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c index 6b94eecc4790..0778591abae7 100644 --- a/drivers/target/iscsi/iscsi_target_login.c +++ b/drivers/target/iscsi/iscsi_target_login.c @@ -715,7 +715,7 @@ void iscsi_post_login_handler( list_add_tail(&conn->conn_list, &sess->sess_conn_list); atomic_inc(&sess->nconn); - pr_debug("Incremented iSCSI Connection count to %hu" + pr_debug("Incremented iSCSI Connection count to %d" " from node: %s\n", atomic_read(&sess->nconn), sess->sess_ops->InitiatorName); spin_unlock_bh(&sess->conn_lock); @@ -763,7 +763,7 @@ void iscsi_post_login_handler( spin_lock_bh(&sess->conn_lock); list_add_tail(&conn->conn_list, &sess->sess_conn_list); atomic_inc(&sess->nconn); - pr_debug("Incremented iSCSI Connection count to %hu from node:" + pr_debug("Incremented iSCSI Connection count to %d from node:" " %s\n", atomic_read(&sess->nconn), sess->sess_ops->InitiatorName); spin_unlock_bh(&sess->conn_lock);
When building with Clang we encounter these warnings: | drivers/target/iscsi/iscsi_target_login.c:719:24: error: format | specifies type 'unsigned short' but the argument has type 'int' | [-Werror,-Wformat] " from node: %s\n", atomic_read(&sess->nconn), - | drivers/target/iscsi/iscsi_target_login.c:767:12: error: format | specifies type 'unsigned short' but the argument has type 'int' | [-Werror,-Wformat] " %s\n", atomic_read(&sess->nconn), - | drivers/target/iscsi/iscsi_target.c:4365:12: error: format specifies | type 'unsigned short' but the argument has type 'int' [-Werror,-Wformat] | " %s\n", atomic_read(&sess->nconn) For all warnings, the format specifier is `%hu` which describes an unsigned short. The resulting type of atomic_read is an int. The proposed fix is to listen to Clang and swap the format specifier. Link: https://github.com/ClangBuiltLinux/linux/issues/378 Signed-off-by: Justin Stitt <justinstitt@google.com> ---