Commit f0d3868b authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: clean up indentation in CIFSSMBQAllEAs 



Add a label that we can goto on error, and reduce some of the
if/then/else indentation in this function.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 370b4191

fs/cifs/cifssmb.c

+75 −76
Original line number Diff line number Diff line
@@ -5282,9 +5282,10 @@ CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon, 
	int rc = 0;

	int bytes_returned;

	int name_len;

	struct fealist *ea_response_data;

	struct fea *temp_fea;

	char *temp_ptr;

	__u16 params, byte_count;

	__u16 params, byte_count, data_offset;



	cFYI(1, ("In Query All EAs path %s", searchName));

QAllEAsRetry:
@@ -5334,38 +5335,39 @@ CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon, 
			 (struct smb_hdr *) pSMBr, &bytes_returned, 0);

	if (rc) {

		cFYI(1, ("Send error in QueryAllEAs = %d", rc));

	} else {		/* decode response */

		rc = validate_t2((struct smb_t2_rsp *)pSMBr);

		goto QAllEAsOut;

	}





	/* BB also check enough total bytes returned */

	/* BB we need to improve the validity checking

	of these trans2 responses */

		if (rc || (pSMBr->ByteCount < 4))



	rc = validate_t2((struct smb_t2_rsp *)pSMBr);

	if (rc || (pSMBr->ByteCount < 4)) {

		rc = -EIO;	/* bad smb */

	   /* else if (pFindData){

			memcpy((char *) pFindData,

			       (char *) &pSMBr->hdr.Protocol +

			       data_offset, kl);

		}*/ else {

		goto QAllEAsOut;

	}



	/* check that length of list is not more than bcc */

	/* check that each entry does not go beyond length

	   of list */

	/* check that each element of each entry does not

	   go beyond end of list */

			__u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);

			struct fealist *ea_response_data;

			rc = 0;

	/* validate_trans2_offsets() */

	/* BB check if start of smb + data_offset > &bcc+ bcc */



	data_offset = le16_to_cpu(pSMBr->t2.DataOffset);

	ea_response_data = (struct fealist *)

				(((char *) &pSMBr->hdr.Protocol) +

				data_offset);

				(((char *) &pSMBr->hdr.Protocol) + data_offset);



	name_len = le32_to_cpu(ea_response_data->list_len);

	cFYI(1, ("ea length %d", name_len));

	if (name_len <= 8) {

			/* returned EA size zeroed at top of function */

		cFYI(1, ("empty EA list returned from server"));

			} else {

		goto QAllEAsOut;

	}



	/* account for ea list len */

	name_len -= 4;

	temp_fea = ea_response_data->list;
@@ -5380,8 +5382,7 @@ CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon, 
		if (rc < (int) buf_size) {

			memcpy(EAData, "user.", 5);

			EAData += 5;

						memcpy(EAData, temp_ptr,

						       temp_fea->name_len);

			memcpy(EAData, temp_ptr, temp_fea->name_len);

			EAData += temp_fea->name_len;

			/* null terminate name */

			*EAData = 0;
@@ -5398,8 +5399,7 @@ CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon, 
		/* account for trailing null */

		name_len--;

		temp_ptr++;

					value_len =

					      le16_to_cpu(temp_fea->value_len);

		value_len = le16_to_cpu(temp_fea->value_len);

		name_len -= value_len;

		temp_ptr += value_len;

		/* BB check that temp_ptr is still
@@ -5410,9 +5410,8 @@ CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon, 
		/* go on to next EA */

		temp_fea = (struct fea *)temp_ptr;

	}

			}

		}

	}



QAllEAsOut:

	cifs_buf_release(pSMB);

	if (rc == -EAGAIN)

		goto QAllEAsRetry;