diff mbox series

[-next] cifs: convert list_for_each to entry variant in cifs_debug.c

Message ID 20210617113640.4141487-1-libaokun1@huawei.com
State New
Headers show
Series [-next] cifs: convert list_for_each to entry variant in cifs_debug.c | expand

Commit Message

libaokun (A) June 17, 2021, 11:36 a.m. UTC
convert list_for_each() to list_for_each_entry() where
applicable.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Baokun Li <libaokun1@huawei.com>
---
 fs/cifs/cifs_debug.c | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

Comments

Steve French June 18, 2021, 4:18 a.m. UTC | #1
tentatively merged into cifs-2.6.git for-next

On Thu, Jun 17, 2021 at 6:40 AM Baokun Li <libaokun1@huawei.com> wrote:
>
> convert list_for_each() to list_for_each_entry() where
> applicable.
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Baokun Li <libaokun1@huawei.com>
> ---
>  fs/cifs/cifs_debug.c | 24 +++++++-----------------
>  1 file changed, 7 insertions(+), 17 deletions(-)
>
> diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
> index 68e8e5b27841..8857ac7e7a14 100644
> --- a/fs/cifs/cifs_debug.c
> +++ b/fs/cifs/cifs_debug.c
> @@ -50,7 +50,6 @@ void cifs_dump_detail(void *buf, struct TCP_Server_Info *server)
>  void cifs_dump_mids(struct TCP_Server_Info *server)
>  {
>  #ifdef CONFIG_CIFS_DEBUG2
> -       struct list_head *tmp;
>         struct mid_q_entry *mid_entry;
>
>         if (server == NULL)
> @@ -58,8 +57,7 @@ void cifs_dump_mids(struct TCP_Server_Info *server)
>
>         cifs_dbg(VFS, "Dump pending requests:\n");
>         spin_lock(&GlobalMid_Lock);
> -       list_for_each(tmp, &server->pending_mid_q) {
> -               mid_entry = list_entry(tmp, struct mid_q_entry, qhead);
> +       list_for_each_entry(mid_entry, &server->pending_mid_q, qhead) {
>                 cifs_dbg(VFS, "State: %d Cmd: %d Pid: %d Cbdata: %p Mid %llu\n",
>                          mid_entry->mid_state,
>                          le16_to_cpu(mid_entry->command),
> @@ -168,7 +166,7 @@ cifs_dump_iface(struct seq_file *m, struct cifs_server_iface *iface)
>
>  static int cifs_debug_files_proc_show(struct seq_file *m, void *v)
>  {
> -       struct list_head *stmp, *tmp, *tmp1, *tmp2;
> +       struct list_head *tmp, *tmp1, *tmp2;
>         struct TCP_Server_Info *server;
>         struct cifs_ses *ses;
>         struct cifs_tcon *tcon;
> @@ -183,9 +181,7 @@ static int cifs_debug_files_proc_show(struct seq_file *m, void *v)
>         seq_printf(m, " <filename>\n");
>  #endif /* CIFS_DEBUG2 */
>         spin_lock(&cifs_tcp_ses_lock);
> -       list_for_each(stmp, &cifs_tcp_ses_list) {
> -               server = list_entry(stmp, struct TCP_Server_Info,
> -                                   tcp_ses_list);
> +       list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
>                 list_for_each(tmp, &server->smb_ses_list) {
>                         ses = list_entry(tmp, struct cifs_ses, smb_ses_list);
>                         list_for_each(tmp1, &ses->tcon_list) {
> @@ -220,7 +216,7 @@ static int cifs_debug_files_proc_show(struct seq_file *m, void *v)
>
>  static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
>  {
> -       struct list_head *tmp1, *tmp2, *tmp3;
> +       struct list_head *tmp2, *tmp3;
>         struct mid_q_entry *mid_entry;
>         struct TCP_Server_Info *server;
>         struct cifs_ses *ses;
> @@ -278,11 +274,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
>
>         c = 0;
>         spin_lock(&cifs_tcp_ses_lock);
> -       list_for_each(tmp1, &cifs_tcp_ses_list) {
> -               server = list_entry(tmp1, struct TCP_Server_Info,
> -                                   tcp_ses_list);
> -
> -               /* channel info will be printed as a part of sessions below */
> +       list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
>                 if (server->is_channel)
>                         continue;
>
> @@ -563,7 +555,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
>  #ifdef CONFIG_CIFS_STATS2
>         int j;
>  #endif /* STATS2 */
> -       struct list_head *tmp1, *tmp2, *tmp3;
> +       struct list_head *tmp2, *tmp3;
>         struct TCP_Server_Info *server;
>         struct cifs_ses *ses;
>         struct cifs_tcon *tcon;
> @@ -594,9 +586,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
>
>         i = 0;
>         spin_lock(&cifs_tcp_ses_lock);
> -       list_for_each(tmp1, &cifs_tcp_ses_list) {
> -               server = list_entry(tmp1, struct TCP_Server_Info,
> -                                   tcp_ses_list);
> +       list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
>                 seq_printf(m, "\nMax requests in flight: %d", server->max_in_flight);
>  #ifdef CONFIG_CIFS_STATS2
>                 seq_puts(m, "\nTotal time spent processing by command. Time ");
>
diff mbox series

Patch

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 68e8e5b27841..8857ac7e7a14 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -50,7 +50,6 @@  void cifs_dump_detail(void *buf, struct TCP_Server_Info *server)
 void cifs_dump_mids(struct TCP_Server_Info *server)
 {
 #ifdef CONFIG_CIFS_DEBUG2
-	struct list_head *tmp;
 	struct mid_q_entry *mid_entry;
 
 	if (server == NULL)
@@ -58,8 +57,7 @@  void cifs_dump_mids(struct TCP_Server_Info *server)
 
 	cifs_dbg(VFS, "Dump pending requests:\n");
 	spin_lock(&GlobalMid_Lock);
-	list_for_each(tmp, &server->pending_mid_q) {
-		mid_entry = list_entry(tmp, struct mid_q_entry, qhead);
+	list_for_each_entry(mid_entry, &server->pending_mid_q, qhead) {
 		cifs_dbg(VFS, "State: %d Cmd: %d Pid: %d Cbdata: %p Mid %llu\n",
 			 mid_entry->mid_state,
 			 le16_to_cpu(mid_entry->command),
@@ -168,7 +166,7 @@  cifs_dump_iface(struct seq_file *m, struct cifs_server_iface *iface)
 
 static int cifs_debug_files_proc_show(struct seq_file *m, void *v)
 {
-	struct list_head *stmp, *tmp, *tmp1, *tmp2;
+	struct list_head *tmp, *tmp1, *tmp2;
 	struct TCP_Server_Info *server;
 	struct cifs_ses *ses;
 	struct cifs_tcon *tcon;
@@ -183,9 +181,7 @@  static int cifs_debug_files_proc_show(struct seq_file *m, void *v)
 	seq_printf(m, " <filename>\n");
 #endif /* CIFS_DEBUG2 */
 	spin_lock(&cifs_tcp_ses_lock);
-	list_for_each(stmp, &cifs_tcp_ses_list) {
-		server = list_entry(stmp, struct TCP_Server_Info,
-				    tcp_ses_list);
+	list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
 		list_for_each(tmp, &server->smb_ses_list) {
 			ses = list_entry(tmp, struct cifs_ses, smb_ses_list);
 			list_for_each(tmp1, &ses->tcon_list) {
@@ -220,7 +216,7 @@  static int cifs_debug_files_proc_show(struct seq_file *m, void *v)
 
 static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
 {
-	struct list_head *tmp1, *tmp2, *tmp3;
+	struct list_head *tmp2, *tmp3;
 	struct mid_q_entry *mid_entry;
 	struct TCP_Server_Info *server;
 	struct cifs_ses *ses;
@@ -278,11 +274,7 @@  static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
 
 	c = 0;
 	spin_lock(&cifs_tcp_ses_lock);
-	list_for_each(tmp1, &cifs_tcp_ses_list) {
-		server = list_entry(tmp1, struct TCP_Server_Info,
-				    tcp_ses_list);
-
-		/* channel info will be printed as a part of sessions below */
+	list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
 		if (server->is_channel)
 			continue;
 
@@ -563,7 +555,7 @@  static int cifs_stats_proc_show(struct seq_file *m, void *v)
 #ifdef CONFIG_CIFS_STATS2
 	int j;
 #endif /* STATS2 */
-	struct list_head *tmp1, *tmp2, *tmp3;
+	struct list_head *tmp2, *tmp3;
 	struct TCP_Server_Info *server;
 	struct cifs_ses *ses;
 	struct cifs_tcon *tcon;
@@ -594,9 +586,7 @@  static int cifs_stats_proc_show(struct seq_file *m, void *v)
 
 	i = 0;
 	spin_lock(&cifs_tcp_ses_lock);
-	list_for_each(tmp1, &cifs_tcp_ses_list) {
-		server = list_entry(tmp1, struct TCP_Server_Info,
-				    tcp_ses_list);
+	list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
 		seq_printf(m, "\nMax requests in flight: %d", server->max_in_flight);
 #ifdef CONFIG_CIFS_STATS2
 		seq_puts(m, "\nTotal time spent processing by command. Time ");