Skip to contentSkip to conversation

cifs: convert list_for_each to entry variant in smb2misc.c

PATCH Superseded Baokun Li 2 participants 3 messages Jun 17, 2021 – Jun 18, 2021

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Baokun Li

author
#0 lore raw

PATCH 1/1 cifs: convert list_for_each to entry variant in smb2misc.c

convert list_for_each() to list_for_each_entry() where applicable.

---
 fs/cifs/smb2misc.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)
fs/cifs/smb2misc.c +6 -14
index 06d555d4da9a..cb08fc64ce68 100644
@@ -164,12 +164,10 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *srvr)
 		struct smb2_transform_hdr *thdr =
 			(struct smb2_transform_hdr *)buf;
 		struct cifs_ses *ses = NULL;
-		struct list_head *tmp;
 
 		/* decrypt frame now that it is completely read in */
 		spin_lock(&cifs_tcp_ses_lock);
-		list_for_each(tmp, &srvr->smb_ses_list) {
-			ses = list_entry(tmp, struct cifs_ses, smb_ses_list);
+		list_for_each_entry(ses, &srvr->smb_ses_list, smb_ses_list) {
 			if (ses->Suid == thdr->SessionId)
 				break;
 
@@ -548,7 +546,6 @@ static bool
 smb2_tcon_has_lease(struct cifs_tcon *tcon, struct smb2_lease_break *rsp)
 {
 	__u8 lease_state;
-	struct list_head *tmp;
 	struct cifsFileInfo *cfile;
 	struct cifsInodeInfo *cinode;
 	int ack_req = le32_to_cpu(rsp->Flags &
@@ -556,8 +553,7 @@ smb2_tcon_has_lease(struct cifs_tcon *tcon, struct smb2_lease_break *rsp)
 
 	lease_state = le32_to_cpu(rsp->NewLeaseState);
 
-	list_for_each(tmp, &tcon->openFileList) {
-		cfile = list_entry(tmp, struct cifsFileInfo, tlist);
+	list_for_each_entry(cfile, &tcon->openFileList, tlist) {
 		cinode = CIFS_I(d_inode(cfile->dentry));
 
 		if (memcmp(cinode->lease_key, rsp->LeaseKey,
@@ -618,7 +614,7 @@ static bool
 smb2_is_valid_lease_break(char *buffer)
 {
 	struct smb2_lease_break *rsp = (struct smb2_lease_break *)buffer;
-	struct list_head *tmp, *tmp1, *tmp2;
+	struct list_head *tmp1, *tmp2;
 	struct TCP_Server_Info *server;
 	struct cifs_ses *ses;
 	struct cifs_tcon *tcon;
@@ -628,9 +624,7 @@ smb2_is_valid_lease_break(char *buffer)
 
 	/* look up tcon based on tid & uid */
 	spin_lock(&cifs_tcp_ses_lock);
-	list_for_each(tmp, &cifs_tcp_ses_list) {
-		server = list_entry(tmp, struct TCP_Server_Info, tcp_ses_list);
-
+	list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
 		list_for_each(tmp1, &server->smb_ses_list) {
 			ses = list_entry(tmp1, struct cifs_ses, smb_ses_list);
 
@@ -687,7 +681,7 @@ bool
 smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)
 {
 	struct smb2_oplock_break *rsp = (struct smb2_oplock_break *)buffer;
-	struct list_head *tmp, *tmp1, *tmp2;
+	struct list_head *tmp1, *tmp2;
 	struct cifs_ses *ses;
 	struct cifs_tcon *tcon;
 	struct cifsInodeInfo *cinode;
@@ -710,9 +704,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)
 
 	/* look up tcon based on tid & uid */
 	spin_lock(&cifs_tcp_ses_lock);
-	list_for_each(tmp, &server->smb_ses_list) {
-		ses = list_entry(tmp, struct cifs_ses, smb_ses_list);
-
+	list_for_each_entry(ses, &server->smb_ses_list, smb_ses_list) {
 		list_for_each(tmp1, &ses->tcon_list) {
 			tcon = list_entry(tmp1, struct cifs_tcon, tcon_list);
 
#1 lore raw

fs/cifs/smb2misc.c smb2_is_valid_lease_break(char *buffer) · line 629

Quoted 10 lines · Baokun Li
fs/cifs/smb2misc.c +1 -3
@@ -628,9 +624,7 @@ smb2_is_valid_lease_break(char *buffer)
 
 	/* look up tcon based on tid & uid */
 	spin_lock(&cifs_tcp_ses_lock);
-	list_for_each(tmp, &cifs_tcp_ses_list) {
-		server = list_entry(tmp, struct TCP_Server_Info, tcp_ses_list);
-
+	list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
 		list_for_each(tmp1, &server->smb_ses_list) {
 			ses = list_entry(tmp1, struct cifs_ses, smb_ses_list);
                        ^^^^^^^^^^^^^^^^

Please convert this one as well.

Quoted 11 lines
fs/cifs/smb2misc.c +1 -1
@@ -687,7 +681,7 @@ bool
 smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)
 {
 	struct smb2_oplock_break *rsp = (struct smb2_oplock_break *)buffer;
-	struct list_head *tmp, *tmp1, *tmp2;
+	struct list_head *tmp1, *tmp2;
 	struct cifs_ses *ses;
 	struct cifs_tcon *tcon;
 	struct cifsInodeInfo *cinode;

fs/cifs/smb2misc.c smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server) · line 709

Quoted 9 lines
fs/cifs/smb2misc.c +1 -3
@@ -710,9 +704,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)
 
 	/* look up tcon based on tid & uid */
 	spin_lock(&cifs_tcp_ses_lock);
-	list_for_each(tmp, &server->smb_ses_list) {
-		ses = list_entry(tmp, struct cifs_ses, smb_ses_list);
-
+	list_for_each_entry(ses, &server->smb_ses_list, smb_ses_list) {
 		list_for_each(tmp1, &ses->tcon_list) {
 			tcon = list_entry(tmp1, struct cifs_tcon, tcon_list);
                        ^^^^^^^^^^^^^^^^^

And this one.

regards,
dan carpenter

Quoted 1 line
#2 lore raw

Thank you for your advice.

I'm about to send a patch v2 with the changes suggested by you.

Best Regards.

Quoted 43 lines · Dan Carpenter

fs/cifs/smb2misc.c smb2_is_valid_lease_break(char *buffer) · line 629

Quoted 10 lines · Baokun Li
fs/cifs/smb2misc.c +1 -3
@@ -628,9 +624,7 @@ smb2_is_valid_lease_break(char *buffer)
 
  	/* look up tcon based on tid & uid */
  	spin_lock(&cifs_tcp_ses_lock);
-	list_for_each(tmp, &cifs_tcp_ses_list) {
-		server = list_entry(tmp, struct TCP_Server_Info, tcp_ses_list);
-
+	list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
  		list_for_each(tmp1, &server->smb_ses_list) {
  			ses = list_entry(tmp1, struct cifs_ses, smb_ses_list);
                         ^^^^^^^^^^^^^^^^

Please convert this one as well.

Quoted 11 lines
fs/cifs/smb2misc.c +1 -1
@@ -687,7 +681,7 @@ bool
  smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)
  {
  	struct smb2_oplock_break *rsp = (struct smb2_oplock_break *)buffer;
-	struct list_head *tmp, *tmp1, *tmp2;
+	struct list_head *tmp1, *tmp2;
  	struct cifs_ses *ses;
  	struct cifs_tcon *tcon;
  	struct cifsInodeInfo *cinode;

fs/cifs/smb2misc.c smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server) · line 709

Quoted 9 lines
fs/cifs/smb2misc.c +1 -3
@@ -710,9 +704,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)
 
  	/* look up tcon based on tid & uid */
  	spin_lock(&cifs_tcp_ses_lock);
-	list_for_each(tmp, &server->smb_ses_list) {
-		ses = list_entry(tmp, struct cifs_ses, smb_ses_list);
-
+	list_for_each_entry(ses, &server->smb_ses_list, smb_ses_list) {
  		list_for_each(tmp1, &ses->tcon_list) {
  			tcon = list_entry(tmp1, struct cifs_tcon, tcon_list);
                         ^^^^^^^^^^^^^^^^^

And this one.

regards,
dan carpenter

Quoted 1 line

.