Commit f7240346 authored by Pavel Zemlyanoy's avatar Pavel Zemlyanoy Committed by Greg Kroah-Hartman
Browse files

staging: erofs: fix 1 warning and 9 checks



This patch does not change the logic, it only
corrects the formatting and checkpatch checks by
braces {} should be used on all arms of this statement,
unbalanced braces around else statement and warning by
braces {} are not necessary for any arm of this statement.

The patch fixes 9 checks of type:
"Check: braces {} should be used on all arms of this statement";
"Check: Unbalanced braces around else statement";

and 1 warning of type:
"WARNING: braces {} are not necessary for any arm of this statement".

Signed-off-by: default avatarPavel Zemlyanoy <zemlyanoy@ispras.ru>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Reviewed-by: default avatarGao Xiang <gaoxiang25@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4fccc8c
Loading
Loading
Loading
Loading
+11 −11
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ int z_erofs_vle_plain_copy(struct page **compressed_pages,
			}
		}

		if (!righthalf)
		if (!righthalf) {
			src = NULL;
		else {
		} else {
			src = mirrored[i] ? percpu_data + i * PAGE_SIZE :
				kmap_atomic(compressed_pages[i]);

@@ -137,11 +137,12 @@ int z_erofs_vle_unzip_fast_percpu(struct page **compressed_pages,
		j = min((unsigned int)PAGE_SIZE - pageofs, outlen);

		if (pages[i]) {
			if (ret < 0)
			if (ret < 0) {
				SetPageError(pages[i]);
			else if (clusterpages == 1 && pages[i] == compressed_pages[0])
			} else if (clusterpages == 1 &&
				   pages[i] == compressed_pages[0]) {
				memcpy(vin + pageofs, vout + pageofs, j);
			else {
			} else {
				void *dst = kmap_atomic(pages[i]);

				memcpy(dst + pageofs, vout + pageofs, j);
@@ -184,9 +185,9 @@ int z_erofs_vle_unzip_vmap(struct page **compressed_pages,
			memcpy(vin + PAGE_SIZE * i, t, PAGE_SIZE);
			kunmap_atomic(t);
		}
	} else if (clusterpages == 1)
	} else if (clusterpages == 1) {
		vin = kmap_atomic(compressed_pages[0]);
	else {
	} else {
		vin = erofs_vmap(compressed_pages, clusterpages);
	}

@@ -198,11 +199,10 @@ int z_erofs_vle_unzip_vmap(struct page **compressed_pages,
	if (!overlapped) {
		if (clusterpages == 1)
			kunmap_atomic(vin);
		else {
		else
			erofs_vunmap(vin, clusterpages);
		}
	} else
	} else {
		preempt_enable();

	}
	return ret;
}