Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6f74e80 authored by NeilBrown's avatar NeilBrown Committed by Steve French
Browse files

cifs: don't check for failure from mempool_alloc() 



mempool_alloc() cannot fail if the gfp flags allow it to
sleep, and both GFP_FS allows for sleeping.

So these tests of the return value from mempool_alloc()
cannot be needed.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 7d0c234f

fs/cifs/misc.c

+5 −9
Original line number Original line Diff line number Diff line
@@ -167,13 +167,11 @@ cifs_buf_get(void) 




	/* clear the first few header bytes */

	/* clear the first few header bytes */

	/* for most paths, more is cleared in header_assemble */

	/* for most paths, more is cleared in header_assemble */

	if (ret_buf) {

	memset(ret_buf, 0, buf_size + 3);

	memset(ret_buf, 0, buf_size + 3);

	atomic_inc(&bufAllocCount);

	atomic_inc(&bufAllocCount);

#ifdef CONFIG_CIFS_STATS2

#ifdef CONFIG_CIFS_STATS2

	atomic_inc(&totBufAllocCount);

	atomic_inc(&totBufAllocCount);

#endif /* CONFIG_CIFS_STATS2 */

#endif /* CONFIG_CIFS_STATS2 */

	}





	return ret_buf;

	return ret_buf;

}

}
@@ -201,7 +199,6 @@ cifs_small_buf_get(void) 
   albeit slightly larger than necessary and maxbuffersize

   albeit slightly larger than necessary and maxbuffersize

   defaults to this and can not be bigger */

   defaults to this and can not be bigger */

	ret_buf = mempool_alloc(cifs_sm_req_poolp, GFP_NOFS);

	ret_buf = mempool_alloc(cifs_sm_req_poolp, GFP_NOFS);

	if (ret_buf) {

	/* No need to clear memory here, cleared in header assemble */

	/* No need to clear memory here, cleared in header assemble */

	/*	memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/

	/*	memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/

	atomic_inc(&smBufAllocCount);

	atomic_inc(&smBufAllocCount);
@@ -209,7 +206,6 @@ cifs_small_buf_get(void) 
	atomic_inc(&totSmBufAllocCount);

	atomic_inc(&totSmBufAllocCount);

#endif /* CONFIG_CIFS_STATS2 */

#endif /* CONFIG_CIFS_STATS2 */





	}

	return ret_buf;

	return ret_buf;

}

}

fs/cifs/smb2transport.c

+13 −17
Original line number Original line Diff line number Diff line
@@ -538,9 +538,6 @@ smb2_mid_entry_alloc(const struct smb2_sync_hdr *shdr, 
	}

	}





	temp = mempool_alloc(cifs_mid_poolp, GFP_NOFS);

	temp = mempool_alloc(cifs_mid_poolp, GFP_NOFS);

	if (temp == NULL)

		return temp;

	else {

	memset(temp, 0, sizeof(struct mid_q_entry));

	memset(temp, 0, sizeof(struct mid_q_entry));

	temp->mid = le64_to_cpu(shdr->MessageId);

	temp->mid = le64_to_cpu(shdr->MessageId);

	temp->pid = current->pid;

	temp->pid = current->pid;
@@ -554,7 +551,6 @@ smb2_mid_entry_alloc(const struct smb2_sync_hdr *shdr, 
	 */

	 */

	temp->callback = cifs_wake_up_task;

	temp->callback = cifs_wake_up_task;

	temp->callback_data = current;

	temp->callback_data = current;

	}





	atomic_inc(&midCount);

	atomic_inc(&midCount);

	temp->mid_state = MID_REQUEST_ALLOCATED;

	temp->mid_state = MID_REQUEST_ALLOCATED;

fs/cifs/transport.c

+14 −18
Original line number Original line Diff line number Diff line
@@ -55,9 +55,6 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server) 
	}

	}





	temp = mempool_alloc(cifs_mid_poolp, GFP_NOFS);

	temp = mempool_alloc(cifs_mid_poolp, GFP_NOFS);

	if (temp == NULL)

		return temp;

	else {

	memset(temp, 0, sizeof(struct mid_q_entry));

	memset(temp, 0, sizeof(struct mid_q_entry));

	temp->mid = get_mid(smb_buffer);

	temp->mid = get_mid(smb_buffer);

	temp->pid = current->pid;

	temp->pid = current->pid;
@@ -74,7 +71,6 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server) 
	 */

	 */

	temp->callback = cifs_wake_up_task;

	temp->callback = cifs_wake_up_task;

	temp->callback_data = current;

	temp->callback_data = current;

	}





	atomic_inc(&midCount);

	atomic_inc(&midCount);

	temp->mid_state = MID_REQUEST_ALLOCATED;

	temp->mid_state = MID_REQUEST_ALLOCATED;