From: Caitlyn <caitlynannefinn@gmail.com>
To: Gao Xiang <gaoxiang25@huawei.com>, Chao Yu <yuchao0@huawei.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Caitlyn <caitlynannefinn@gmail.com>,
"Tobin C . Harding" <me@tobin.cc>,
linux-erofs@lists.ozlabs.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] staging/erofs: Balanced braces around a few conditional statements.
Date: Tue, 20 Aug 2019 20:18:20 -0400 [thread overview]
Message-ID: <1566346700-28536-3-git-send-email-caitlynannefinn@gmail.com> (raw)
In-Reply-To: <1566346700-28536-1-git-send-email-caitlynannefinn@gmail.com>
Balanced braces to fix some checkpath warnings in inode.c and
unzip_vle.c
Signed-off-by: Caitlyn <caitlynannefinn@gmail.com>
---
drivers/staging/erofs/inode.c | 4 ++--
drivers/staging/erofs/unzip_vle.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/erofs/inode.c b/drivers/staging/erofs/inode.c
index 4c3d8bf..8de6fcd 100644
--- a/drivers/staging/erofs/inode.c
+++ b/drivers/staging/erofs/inode.c
@@ -278,9 +278,9 @@ struct inode *erofs_iget(struct super_block *sb,
vi->nid = nid;
err = fill_inode(inode, isdir);
- if (likely(!err))
+ if (likely(!err)) {
unlock_new_inode(inode);
- else {
+ } else {
iget_failed(inode);
inode = ERR_PTR(err);
}
diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c
index f0dab81..f431614 100644
--- a/drivers/staging/erofs/unzip_vle.c
+++ b/drivers/staging/erofs/unzip_vle.c
@@ -915,21 +915,21 @@ static int z_erofs_vle_unzip(struct super_block *sb,
mutex_lock(&work->lock);
nr_pages = work->nr_pages;
- if (likely(nr_pages <= Z_EROFS_VLE_VMAP_ONSTACK_PAGES))
+ if (likely(nr_pages <= Z_EROFS_VLE_VMAP_ONSTACK_PAGES)) {
pages = pages_onstack;
- else if (nr_pages <= Z_EROFS_VLE_VMAP_GLOBAL_PAGES &&
- mutex_trylock(&z_pagemap_global_lock))
+ } else if (nr_pages <= Z_EROFS_VLE_VMAP_GLOBAL_PAGES &&
+ mutex_trylock(&z_pagemap_global_lock)) {
pages = z_pagemap_global;
- else {
+ } else {
repeat:
pages = kvmalloc_array(nr_pages, sizeof(struct page *),
GFP_KERNEL);
/* fallback to global pagemap for the lowmem scenario */
if (unlikely(!pages)) {
- if (nr_pages > Z_EROFS_VLE_VMAP_GLOBAL_PAGES)
+ if (nr_pages > Z_EROFS_VLE_VMAP_GLOBAL_PAGES) {
goto repeat;
- else {
+ } else {
mutex_lock(&z_pagemap_global_lock);
pages = z_pagemap_global;
}
--
2.7.4
next prev parent reply other threads:[~2019-08-21 0:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 0:18 [PATCH 0/2] Submitting my first patch series (Checkpatch fixes) Caitlyn
2019-08-21 0:18 ` [PATCH 1/2] staging/erofs/xattr.h: Fixed misaligned function arguments Caitlyn
2019-08-21 2:20 ` Greg Kroah-Hartman
2019-08-21 0:18 ` Caitlyn [this message]
2019-08-21 0:40 ` [PATCH 2/2] staging/erofs: Balanced braces around a few conditional statements Gao Xiang
2019-08-21 2:26 ` Joe Perches
2019-08-21 2:31 ` Gao Xiang
2019-08-21 15:13 ` Tobin C. Harding
2019-08-21 15:52 ` Gao Xiang
2019-08-21 20:11 ` Caitlyn Finn
2019-08-21 0:39 ` [PATCH 0/2] Submitting my first patch series (Checkpatch fixes) Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1566346700-28536-3-git-send-email-caitlynannefinn@gmail.com \
--to=caitlynannefinn@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gaoxiang25@huawei.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=me@tobin.cc \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®