* [PATCH v5 1/2] staging: erofs: Modify coding style alignments
@ 2018-11-05 19:48 ` Bhagyashri P. Dighole
0 siblings, 0 replies; 8+ messages in thread
From: Bhagyashri P. Dighole @ 2018-11-05 19:48 UTC (permalink / raw)
Fix coding style alignment issues detected by checkpatch.pl
Matched alignments with parenthesis.
Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri at gmail.com>
Reviewed-by: Gao Xiang <gaoxiang25 at huawei.com>
---
Changes in v5:
- Add reviewer.
Changes in v4:
- Add changelog messages for patch versions.
Changes in v3:
- Split patch in two patches. Each patch have similar
kind of changes. One patch for all alignment fixes and
second patch for all conditional check fixes.
Changes in v2:
- Change for one alignment issue and one conditional check issue.
Changes in v1:
- Change for all issues in data.c detected by checkpatch.pl
drivers/staging/erofs/data.c | 51 ++++++++++++++++++------------------
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
index 6384f73e5418..b66191ad44aa 100644
--- a/drivers/staging/erofs/data.c
+++ b/drivers/staging/erofs/data.c
@@ -40,7 +40,7 @@ static inline void read_endio(struct bio *bio)
/* prio -- true is used for dir */
struct page *__erofs_get_meta_page(struct super_block *sb,
- erofs_blk_t blkaddr, bool prio, bool nofail)
+ erofs_blk_t blkaddr, bool prio, bool nofail)
{
struct inode *const bd_inode = sb->s_bdev->bd_inode;
struct address_space *const mapping = bd_inode->i_mapping;
@@ -76,7 +76,7 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
}
__submit_bio(bio, REQ_OP_READ,
- REQ_META | (prio ? REQ_PRIO : 0));
+ REQ_META | (prio ? REQ_PRIO : 0));
lock_page(page);
@@ -107,8 +107,8 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
}
static int erofs_map_blocks_flatmode(struct inode *inode,
- struct erofs_map_blocks *map,
- int flags)
+ struct erofs_map_blocks *map,
+ int flags)
{
int err = 0;
erofs_blk_t nblocks, lastblk;
@@ -151,7 +151,7 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
map->m_flags |= EROFS_MAP_META;
} else {
errln("internal error @ nid: %llu (size %llu), m_la 0x%llx",
- vi->nid, inode->i_size, map->m_la);
+ vi->nid, inode->i_size, map->m_la);
DBG_BUGON(1);
err = -EIO;
goto err_out;
@@ -167,12 +167,13 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
#ifdef CONFIG_EROFS_FS_ZIP
extern int z_erofs_map_blocks_iter(struct inode *,
- struct erofs_map_blocks *, struct page **, int);
+ struct erofs_map_blocks *,
+ struct page **, int);
#endif
int erofs_map_blocks_iter(struct inode *inode,
- struct erofs_map_blocks *map,
- struct page **mpage_ret, int flags)
+ struct erofs_map_blocks *map,
+ struct page **mpage_ret, int flags)
{
/* by default, reading raw data never use erofs_map_blocks_iter */
if (unlikely(!is_inode_layout_compression(inode))) {
@@ -192,7 +193,7 @@ int erofs_map_blocks_iter(struct inode *inode,
}
int erofs_map_blocks(struct inode *inode,
- struct erofs_map_blocks *map, int flags)
+ struct erofs_map_blocks *map, int flags)
{
if (unlikely(is_inode_layout_compression(inode))) {
struct page *mpage = NULL;
@@ -206,13 +207,12 @@ int erofs_map_blocks(struct inode *inode,
return erofs_map_blocks_flatmode(inode, map, flags);
}
-static inline struct bio *erofs_read_raw_page(
- struct bio *bio,
- struct address_space *mapping,
- struct page *page,
- erofs_off_t *last_block,
- unsigned int nblocks,
- bool ra)
+static inline struct bio *erofs_read_raw_page(struct bio *bio,
+ struct address_space *mapping,
+ struct page *page,
+ erofs_off_t *last_block,
+ unsigned int nblocks,
+ bool ra)
{
struct inode *inode = mapping->host;
erofs_off_t current_block = (erofs_off_t)page->index;
@@ -233,8 +233,8 @@ static inline struct bio *erofs_read_raw_page(
/* note that for readpage case, bio also equals to NULL */
if (bio != NULL &&
- /* not continuous */
- *last_block + 1 != current_block) {
+ /* not continuous */
+ *last_block + 1 != current_block) {
submit_bio_retry:
__submit_bio(bio, REQ_OP_READ, 0);
bio = NULL;
@@ -307,7 +307,7 @@ static inline struct bio *erofs_read_raw_page(
nblocks = BIO_MAX_PAGES;
bio = erofs_grab_bio(inode->i_sb,
- blknr, nblocks, read_endio, false);
+ blknr, nblocks, read_endio, false);
if (IS_ERR(bio)) {
err = PTR_ERR(bio);
@@ -361,7 +361,7 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
trace_erofs_readpage(page, true);
bio = erofs_read_raw_page(NULL, page->mapping,
- page, &last_block, 1, false);
+ page, &last_block, 1, false);
if (IS_ERR(bio))
return PTR_ERR(bio);
@@ -371,8 +371,9 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
}
static int erofs_raw_access_readpages(struct file *filp,
- struct address_space *mapping,
- struct list_head *pages, unsigned int nr_pages)
+ struct address_space *mapping,
+ struct list_head *pages,
+ unsigned int nr_pages)
{
erofs_off_t last_block;
struct bio *bio = NULL;
@@ -389,13 +390,13 @@ static int erofs_raw_access_readpages(struct file *filp,
if (!add_to_page_cache_lru(page, mapping, page->index, gfp)) {
bio = erofs_read_raw_page(bio, mapping, page,
- &last_block, nr_pages, true);
+ &last_block, nr_pages, true);
/* all the page errors are ignored when readahead */
if (IS_ERR(bio)) {
pr_err("%s, readahead error at page %lu of nid %llu\n",
- __func__, page->index,
- EROFS_V(mapping->host)->nid);
+ __func__, page->index,
+ EROFS_V(mapping->host)->nid);
bio = NULL;
}
--
2.19.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 1/2] staging: erofs: Modify coding style alignments
@ 2018-11-05 19:48 ` Bhagyashri P. Dighole
0 siblings, 0 replies; 8+ messages in thread
From: Bhagyashri P. Dighole @ 2018-11-05 19:48 UTC (permalink / raw)
To: Gao Xiang, Chao Yu, Greg Kroah-Hartman, Sasha Levin
Cc: Outreachy, linux-erofs
Fix coding style alignment issues detected by checkpatch.pl
Matched alignments with parenthesis.
Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri@gmail.com>
Reviewed-by: Gao Xiang <gaoxiang25@huawei.com>
---
Changes in v5:
- Add reviewer.
Changes in v4:
- Add changelog messages for patch versions.
Changes in v3:
- Split patch in two patches. Each patch have similar
kind of changes. One patch for all alignment fixes and
second patch for all conditional check fixes.
Changes in v2:
- Change for one alignment issue and one conditional check issue.
Changes in v1:
- Change for all issues in data.c detected by checkpatch.pl
drivers/staging/erofs/data.c | 51 ++++++++++++++++++------------------
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
index 6384f73e5418..b66191ad44aa 100644
--- a/drivers/staging/erofs/data.c
+++ b/drivers/staging/erofs/data.c
@@ -40,7 +40,7 @@ static inline void read_endio(struct bio *bio)
/* prio -- true is used for dir */
struct page *__erofs_get_meta_page(struct super_block *sb,
- erofs_blk_t blkaddr, bool prio, bool nofail)
+ erofs_blk_t blkaddr, bool prio, bool nofail)
{
struct inode *const bd_inode = sb->s_bdev->bd_inode;
struct address_space *const mapping = bd_inode->i_mapping;
@@ -76,7 +76,7 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
}
__submit_bio(bio, REQ_OP_READ,
- REQ_META | (prio ? REQ_PRIO : 0));
+ REQ_META | (prio ? REQ_PRIO : 0));
lock_page(page);
@@ -107,8 +107,8 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
}
static int erofs_map_blocks_flatmode(struct inode *inode,
- struct erofs_map_blocks *map,
- int flags)
+ struct erofs_map_blocks *map,
+ int flags)
{
int err = 0;
erofs_blk_t nblocks, lastblk;
@@ -151,7 +151,7 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
map->m_flags |= EROFS_MAP_META;
} else {
errln("internal error @ nid: %llu (size %llu), m_la 0x%llx",
- vi->nid, inode->i_size, map->m_la);
+ vi->nid, inode->i_size, map->m_la);
DBG_BUGON(1);
err = -EIO;
goto err_out;
@@ -167,12 +167,13 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
#ifdef CONFIG_EROFS_FS_ZIP
extern int z_erofs_map_blocks_iter(struct inode *,
- struct erofs_map_blocks *, struct page **, int);
+ struct erofs_map_blocks *,
+ struct page **, int);
#endif
int erofs_map_blocks_iter(struct inode *inode,
- struct erofs_map_blocks *map,
- struct page **mpage_ret, int flags)
+ struct erofs_map_blocks *map,
+ struct page **mpage_ret, int flags)
{
/* by default, reading raw data never use erofs_map_blocks_iter */
if (unlikely(!is_inode_layout_compression(inode))) {
@@ -192,7 +193,7 @@ int erofs_map_blocks_iter(struct inode *inode,
}
int erofs_map_blocks(struct inode *inode,
- struct erofs_map_blocks *map, int flags)
+ struct erofs_map_blocks *map, int flags)
{
if (unlikely(is_inode_layout_compression(inode))) {
struct page *mpage = NULL;
@@ -206,13 +207,12 @@ int erofs_map_blocks(struct inode *inode,
return erofs_map_blocks_flatmode(inode, map, flags);
}
-static inline struct bio *erofs_read_raw_page(
- struct bio *bio,
- struct address_space *mapping,
- struct page *page,
- erofs_off_t *last_block,
- unsigned int nblocks,
- bool ra)
+static inline struct bio *erofs_read_raw_page(struct bio *bio,
+ struct address_space *mapping,
+ struct page *page,
+ erofs_off_t *last_block,
+ unsigned int nblocks,
+ bool ra)
{
struct inode *inode = mapping->host;
erofs_off_t current_block = (erofs_off_t)page->index;
@@ -233,8 +233,8 @@ static inline struct bio *erofs_read_raw_page(
/* note that for readpage case, bio also equals to NULL */
if (bio != NULL &&
- /* not continuous */
- *last_block + 1 != current_block) {
+ /* not continuous */
+ *last_block + 1 != current_block) {
submit_bio_retry:
__submit_bio(bio, REQ_OP_READ, 0);
bio = NULL;
@@ -307,7 +307,7 @@ static inline struct bio *erofs_read_raw_page(
nblocks = BIO_MAX_PAGES;
bio = erofs_grab_bio(inode->i_sb,
- blknr, nblocks, read_endio, false);
+ blknr, nblocks, read_endio, false);
if (IS_ERR(bio)) {
err = PTR_ERR(bio);
@@ -361,7 +361,7 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
trace_erofs_readpage(page, true);
bio = erofs_read_raw_page(NULL, page->mapping,
- page, &last_block, 1, false);
+ page, &last_block, 1, false);
if (IS_ERR(bio))
return PTR_ERR(bio);
@@ -371,8 +371,9 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
}
static int erofs_raw_access_readpages(struct file *filp,
- struct address_space *mapping,
- struct list_head *pages, unsigned int nr_pages)
+ struct address_space *mapping,
+ struct list_head *pages,
+ unsigned int nr_pages)
{
erofs_off_t last_block;
struct bio *bio = NULL;
@@ -389,13 +390,13 @@ static int erofs_raw_access_readpages(struct file *filp,
if (!add_to_page_cache_lru(page, mapping, page->index, gfp)) {
bio = erofs_read_raw_page(bio, mapping, page,
- &last_block, nr_pages, true);
+ &last_block, nr_pages, true);
/* all the page errors are ignored when readahead */
if (IS_ERR(bio)) {
pr_err("%s, readahead error at page %lu of nid %llu\n",
- __func__, page->index,
- EROFS_V(mapping->host)->nid);
+ __func__, page->index,
+ EROFS_V(mapping->host)->nid);
bio = NULL;
}
--
2.19.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 2/2] staging: erofs: Modify conditional checks
2018-11-05 19:48 ` Bhagyashri P. Dighole
@ 2018-11-05 19:49 ` Bhagyashri P. Dighole
-1 siblings, 0 replies; 8+ messages in thread
From: Bhagyashri P. Dighole @ 2018-11-05 19:49 UTC (permalink / raw)
Fix coding style alignment issues detected by checkpatch.pl
Use ! for NULL test rather than explicitly comparing to NULL.
Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri at gmail.com>
Reviewed-by: Gao Xiang <gaoxiang25 at huawei.com>
---
Changes in v5:
- Add reviewer.
Changes in v4:
- Add changelog messages for patch versions.
Changes in v3:
- Split patch in two patches. Each patch have similar
kind of changes. One patch for all alignment fixes and
second patch for all conditional check fixes.
Changes in v2:
- Change for one alignment issue and one conditional check issue.
Changes in v1:
- Change for all issues in data.c detected by checkpatch.pl
drivers/staging/erofs/data.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
index b66191ad44aa..5a55f0bfdfbb 100644
--- a/drivers/staging/erofs/data.c
+++ b/drivers/staging/erofs/data.c
@@ -53,7 +53,7 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
repeat:
page = find_or_create_page(mapping, blkaddr, gfp);
- if (unlikely(page == NULL)) {
+ if (unlikely(!page)) {
DBG_BUGON(nofail);
return ERR_PTR(-ENOMEM);
}
@@ -177,7 +177,7 @@ int erofs_map_blocks_iter(struct inode *inode,
{
/* by default, reading raw data never use erofs_map_blocks_iter */
if (unlikely(!is_inode_layout_compression(inode))) {
- if (*mpage_ret != NULL)
+ if (*mpage_ret)
put_page(*mpage_ret);
*mpage_ret = NULL;
@@ -200,7 +200,7 @@ int erofs_map_blocks(struct inode *inode,
int err;
err = erofs_map_blocks_iter(inode, map, &mpage, flags);
- if (mpage != NULL)
+ if (mpage)
put_page(mpage);
return err;
}
@@ -232,7 +232,7 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,
}
/* note that for readpage case, bio also equals to NULL */
- if (bio != NULL &&
+ if (bio &&
/* not continuous */
*last_block + 1 != current_block) {
submit_bio_retry:
@@ -240,7 +240,7 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,
bio = NULL;
}
- if (bio == NULL) {
+ if (!bio) {
struct erofs_map_blocks map = {
.m_la = blknr_to_addr(current_block),
};
@@ -342,7 +342,7 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,
unlock_page(page);
/* if updated manually, continuous pages has a gap */
- if (bio != NULL)
+ if (bio)
submit_bio_out:
__submit_bio(bio, REQ_OP_READ, 0);
@@ -408,7 +408,7 @@ static int erofs_raw_access_readpages(struct file *filp,
DBG_BUGON(!list_empty(pages));
/* the rare case (end in gaps) */
- if (unlikely(bio != NULL))
+ if (unlikely(bio))
__submit_bio(bio, REQ_OP_READ, 0);
return 0;
}
--
2.19.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 2/2] staging: erofs: Modify conditional checks
@ 2018-11-05 19:49 ` Bhagyashri P. Dighole
0 siblings, 0 replies; 8+ messages in thread
From: Bhagyashri P. Dighole @ 2018-11-05 19:49 UTC (permalink / raw)
To: Gao Xiang, Chao Yu, Greg Kroah-Hartman, Sasha Levin
Cc: Outreachy, linux-erofs
Fix coding style alignment issues detected by checkpatch.pl
Use ! for NULL test rather than explicitly comparing to NULL.
Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri@gmail.com>
Reviewed-by: Gao Xiang <gaoxiang25@huawei.com>
---
Changes in v5:
- Add reviewer.
Changes in v4:
- Add changelog messages for patch versions.
Changes in v3:
- Split patch in two patches. Each patch have similar
kind of changes. One patch for all alignment fixes and
second patch for all conditional check fixes.
Changes in v2:
- Change for one alignment issue and one conditional check issue.
Changes in v1:
- Change for all issues in data.c detected by checkpatch.pl
drivers/staging/erofs/data.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
index b66191ad44aa..5a55f0bfdfbb 100644
--- a/drivers/staging/erofs/data.c
+++ b/drivers/staging/erofs/data.c
@@ -53,7 +53,7 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
repeat:
page = find_or_create_page(mapping, blkaddr, gfp);
- if (unlikely(page == NULL)) {
+ if (unlikely(!page)) {
DBG_BUGON(nofail);
return ERR_PTR(-ENOMEM);
}
@@ -177,7 +177,7 @@ int erofs_map_blocks_iter(struct inode *inode,
{
/* by default, reading raw data never use erofs_map_blocks_iter */
if (unlikely(!is_inode_layout_compression(inode))) {
- if (*mpage_ret != NULL)
+ if (*mpage_ret)
put_page(*mpage_ret);
*mpage_ret = NULL;
@@ -200,7 +200,7 @@ int erofs_map_blocks(struct inode *inode,
int err;
err = erofs_map_blocks_iter(inode, map, &mpage, flags);
- if (mpage != NULL)
+ if (mpage)
put_page(mpage);
return err;
}
@@ -232,7 +232,7 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,
}
/* note that for readpage case, bio also equals to NULL */
- if (bio != NULL &&
+ if (bio &&
/* not continuous */
*last_block + 1 != current_block) {
submit_bio_retry:
@@ -240,7 +240,7 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,
bio = NULL;
}
- if (bio == NULL) {
+ if (!bio) {
struct erofs_map_blocks map = {
.m_la = blknr_to_addr(current_block),
};
@@ -342,7 +342,7 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,
unlock_page(page);
/* if updated manually, continuous pages has a gap */
- if (bio != NULL)
+ if (bio)
submit_bio_out:
__submit_bio(bio, REQ_OP_READ, 0);
@@ -408,7 +408,7 @@ static int erofs_raw_access_readpages(struct file *filp,
DBG_BUGON(!list_empty(pages));
/* the rare case (end in gaps) */
- if (unlikely(bio != NULL))
+ if (unlikely(bio))
__submit_bio(bio, REQ_OP_READ, 0);
return 0;
}
--
2.19.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Outreachy kernel] [PATCH v5 1/2] staging: erofs: Modify coding style alignments
2018-11-05 19:48 ` Bhagyashri P. Dighole
@ 2018-11-05 20:35 ` Julia Lawall
-1 siblings, 0 replies; 8+ messages in thread
From: Julia Lawall @ 2018-11-05 20:35 UTC (permalink / raw)
On Mon, 5 Nov 2018, Bhagyashri P. Dighole wrote:
> Fix coding style alignment issues detected by checkpatch.pl
> Matched alignments with parenthesis.
>
> Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri at gmail.com>
> Reviewed-by: Gao Xiang <gaoxiang25 at huawei.com>
Good job on adding the reviewer. However, did Gao give a Reviewed-by for
both patches? I remember only one, but I may have missed it.
In any case, the cover letter for the series seems to have gotten lost in
the shuffle...
julia
> ---
> Changes in v5:
> - Add reviewer.
>
> Changes in v4:
> - Add changelog messages for patch versions.
>
> Changes in v3:
> - Split patch in two patches. Each patch have similar
> kind of changes. One patch for all alignment fixes and
> second patch for all conditional check fixes.
>
> Changes in v2:
> - Change for one alignment issue and one conditional check issue.
>
> Changes in v1:
> - Change for all issues in data.c detected by checkpatch.pl
>
> drivers/staging/erofs/data.c | 51 ++++++++++++++++++------------------
> 1 file changed, 26 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
> index 6384f73e5418..b66191ad44aa 100644
> --- a/drivers/staging/erofs/data.c
> +++ b/drivers/staging/erofs/data.c
> @@ -40,7 +40,7 @@ static inline void read_endio(struct bio *bio)
>
> /* prio -- true is used for dir */
> struct page *__erofs_get_meta_page(struct super_block *sb,
> - erofs_blk_t blkaddr, bool prio, bool nofail)
> + erofs_blk_t blkaddr, bool prio, bool nofail)
> {
> struct inode *const bd_inode = sb->s_bdev->bd_inode;
> struct address_space *const mapping = bd_inode->i_mapping;
> @@ -76,7 +76,7 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
> }
>
> __submit_bio(bio, REQ_OP_READ,
> - REQ_META | (prio ? REQ_PRIO : 0));
> + REQ_META | (prio ? REQ_PRIO : 0));
>
> lock_page(page);
>
> @@ -107,8 +107,8 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
> }
>
> static int erofs_map_blocks_flatmode(struct inode *inode,
> - struct erofs_map_blocks *map,
> - int flags)
> + struct erofs_map_blocks *map,
> + int flags)
> {
> int err = 0;
> erofs_blk_t nblocks, lastblk;
> @@ -151,7 +151,7 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
> map->m_flags |= EROFS_MAP_META;
> } else {
> errln("internal error @ nid: %llu (size %llu), m_la 0x%llx",
> - vi->nid, inode->i_size, map->m_la);
> + vi->nid, inode->i_size, map->m_la);
> DBG_BUGON(1);
> err = -EIO;
> goto err_out;
> @@ -167,12 +167,13 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
>
> #ifdef CONFIG_EROFS_FS_ZIP
> extern int z_erofs_map_blocks_iter(struct inode *,
> - struct erofs_map_blocks *, struct page **, int);
> + struct erofs_map_blocks *,
> + struct page **, int);
> #endif
>
> int erofs_map_blocks_iter(struct inode *inode,
> - struct erofs_map_blocks *map,
> - struct page **mpage_ret, int flags)
> + struct erofs_map_blocks *map,
> + struct page **mpage_ret, int flags)
> {
> /* by default, reading raw data never use erofs_map_blocks_iter */
> if (unlikely(!is_inode_layout_compression(inode))) {
> @@ -192,7 +193,7 @@ int erofs_map_blocks_iter(struct inode *inode,
> }
>
> int erofs_map_blocks(struct inode *inode,
> - struct erofs_map_blocks *map, int flags)
> + struct erofs_map_blocks *map, int flags)
> {
> if (unlikely(is_inode_layout_compression(inode))) {
> struct page *mpage = NULL;
> @@ -206,13 +207,12 @@ int erofs_map_blocks(struct inode *inode,
> return erofs_map_blocks_flatmode(inode, map, flags);
> }
>
> -static inline struct bio *erofs_read_raw_page(
> - struct bio *bio,
> - struct address_space *mapping,
> - struct page *page,
> - erofs_off_t *last_block,
> - unsigned int nblocks,
> - bool ra)
> +static inline struct bio *erofs_read_raw_page(struct bio *bio,
> + struct address_space *mapping,
> + struct page *page,
> + erofs_off_t *last_block,
> + unsigned int nblocks,
> + bool ra)
> {
> struct inode *inode = mapping->host;
> erofs_off_t current_block = (erofs_off_t)page->index;
> @@ -233,8 +233,8 @@ static inline struct bio *erofs_read_raw_page(
>
> /* note that for readpage case, bio also equals to NULL */
> if (bio != NULL &&
> - /* not continuous */
> - *last_block + 1 != current_block) {
> + /* not continuous */
> + *last_block + 1 != current_block) {
> submit_bio_retry:
> __submit_bio(bio, REQ_OP_READ, 0);
> bio = NULL;
> @@ -307,7 +307,7 @@ static inline struct bio *erofs_read_raw_page(
> nblocks = BIO_MAX_PAGES;
>
> bio = erofs_grab_bio(inode->i_sb,
> - blknr, nblocks, read_endio, false);
> + blknr, nblocks, read_endio, false);
>
> if (IS_ERR(bio)) {
> err = PTR_ERR(bio);
> @@ -361,7 +361,7 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
> trace_erofs_readpage(page, true);
>
> bio = erofs_read_raw_page(NULL, page->mapping,
> - page, &last_block, 1, false);
> + page, &last_block, 1, false);
>
> if (IS_ERR(bio))
> return PTR_ERR(bio);
> @@ -371,8 +371,9 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
> }
>
> static int erofs_raw_access_readpages(struct file *filp,
> - struct address_space *mapping,
> - struct list_head *pages, unsigned int nr_pages)
> + struct address_space *mapping,
> + struct list_head *pages,
> + unsigned int nr_pages)
> {
> erofs_off_t last_block;
> struct bio *bio = NULL;
> @@ -389,13 +390,13 @@ static int erofs_raw_access_readpages(struct file *filp,
>
> if (!add_to_page_cache_lru(page, mapping, page->index, gfp)) {
> bio = erofs_read_raw_page(bio, mapping, page,
> - &last_block, nr_pages, true);
> + &last_block, nr_pages, true);
>
> /* all the page errors are ignored when readahead */
> if (IS_ERR(bio)) {
> pr_err("%s, readahead error at page %lu of nid %llu\n",
> - __func__, page->index,
> - EROFS_V(mapping->host)->nid);
> + __func__, page->index,
> + EROFS_V(mapping->host)->nid);
>
> bio = NULL;
> }
> --
> 2.19.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe at googlegroups.com.
> To post to this group, send email to outreachy-kernel at googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/b14ab748b6c00632bb2234000d96a7e1912e2b1b.1541446384.git.digholebhagyashri%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Outreachy kernel] [PATCH v5 1/2] staging: erofs: Modify coding style alignments
@ 2018-11-05 20:35 ` Julia Lawall
0 siblings, 0 replies; 8+ messages in thread
From: Julia Lawall @ 2018-11-05 20:35 UTC (permalink / raw)
To: Bhagyashri P. Dighole
Cc: Gao Xiang, Chao Yu, Greg Kroah-Hartman, Sasha Levin, Outreachy,
linux-erofs
On Mon, 5 Nov 2018, Bhagyashri P. Dighole wrote:
> Fix coding style alignment issues detected by checkpatch.pl
> Matched alignments with parenthesis.
>
> Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri@gmail.com>
> Reviewed-by: Gao Xiang <gaoxiang25@huawei.com>
Good job on adding the reviewer. However, did Gao give a Reviewed-by for
both patches? I remember only one, but I may have missed it.
In any case, the cover letter for the series seems to have gotten lost in
the shuffle...
julia
> ---
> Changes in v5:
> - Add reviewer.
>
> Changes in v4:
> - Add changelog messages for patch versions.
>
> Changes in v3:
> - Split patch in two patches. Each patch have similar
> kind of changes. One patch for all alignment fixes and
> second patch for all conditional check fixes.
>
> Changes in v2:
> - Change for one alignment issue and one conditional check issue.
>
> Changes in v1:
> - Change for all issues in data.c detected by checkpatch.pl
>
> drivers/staging/erofs/data.c | 51 ++++++++++++++++++------------------
> 1 file changed, 26 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
> index 6384f73e5418..b66191ad44aa 100644
> --- a/drivers/staging/erofs/data.c
> +++ b/drivers/staging/erofs/data.c
> @@ -40,7 +40,7 @@ static inline void read_endio(struct bio *bio)
>
> /* prio -- true is used for dir */
> struct page *__erofs_get_meta_page(struct super_block *sb,
> - erofs_blk_t blkaddr, bool prio, bool nofail)
> + erofs_blk_t blkaddr, bool prio, bool nofail)
> {
> struct inode *const bd_inode = sb->s_bdev->bd_inode;
> struct address_space *const mapping = bd_inode->i_mapping;
> @@ -76,7 +76,7 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
> }
>
> __submit_bio(bio, REQ_OP_READ,
> - REQ_META | (prio ? REQ_PRIO : 0));
> + REQ_META | (prio ? REQ_PRIO : 0));
>
> lock_page(page);
>
> @@ -107,8 +107,8 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
> }
>
> static int erofs_map_blocks_flatmode(struct inode *inode,
> - struct erofs_map_blocks *map,
> - int flags)
> + struct erofs_map_blocks *map,
> + int flags)
> {
> int err = 0;
> erofs_blk_t nblocks, lastblk;
> @@ -151,7 +151,7 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
> map->m_flags |= EROFS_MAP_META;
> } else {
> errln("internal error @ nid: %llu (size %llu), m_la 0x%llx",
> - vi->nid, inode->i_size, map->m_la);
> + vi->nid, inode->i_size, map->m_la);
> DBG_BUGON(1);
> err = -EIO;
> goto err_out;
> @@ -167,12 +167,13 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
>
> #ifdef CONFIG_EROFS_FS_ZIP
> extern int z_erofs_map_blocks_iter(struct inode *,
> - struct erofs_map_blocks *, struct page **, int);
> + struct erofs_map_blocks *,
> + struct page **, int);
> #endif
>
> int erofs_map_blocks_iter(struct inode *inode,
> - struct erofs_map_blocks *map,
> - struct page **mpage_ret, int flags)
> + struct erofs_map_blocks *map,
> + struct page **mpage_ret, int flags)
> {
> /* by default, reading raw data never use erofs_map_blocks_iter */
> if (unlikely(!is_inode_layout_compression(inode))) {
> @@ -192,7 +193,7 @@ int erofs_map_blocks_iter(struct inode *inode,
> }
>
> int erofs_map_blocks(struct inode *inode,
> - struct erofs_map_blocks *map, int flags)
> + struct erofs_map_blocks *map, int flags)
> {
> if (unlikely(is_inode_layout_compression(inode))) {
> struct page *mpage = NULL;
> @@ -206,13 +207,12 @@ int erofs_map_blocks(struct inode *inode,
> return erofs_map_blocks_flatmode(inode, map, flags);
> }
>
> -static inline struct bio *erofs_read_raw_page(
> - struct bio *bio,
> - struct address_space *mapping,
> - struct page *page,
> - erofs_off_t *last_block,
> - unsigned int nblocks,
> - bool ra)
> +static inline struct bio *erofs_read_raw_page(struct bio *bio,
> + struct address_space *mapping,
> + struct page *page,
> + erofs_off_t *last_block,
> + unsigned int nblocks,
> + bool ra)
> {
> struct inode *inode = mapping->host;
> erofs_off_t current_block = (erofs_off_t)page->index;
> @@ -233,8 +233,8 @@ static inline struct bio *erofs_read_raw_page(
>
> /* note that for readpage case, bio also equals to NULL */
> if (bio != NULL &&
> - /* not continuous */
> - *last_block + 1 != current_block) {
> + /* not continuous */
> + *last_block + 1 != current_block) {
> submit_bio_retry:
> __submit_bio(bio, REQ_OP_READ, 0);
> bio = NULL;
> @@ -307,7 +307,7 @@ static inline struct bio *erofs_read_raw_page(
> nblocks = BIO_MAX_PAGES;
>
> bio = erofs_grab_bio(inode->i_sb,
> - blknr, nblocks, read_endio, false);
> + blknr, nblocks, read_endio, false);
>
> if (IS_ERR(bio)) {
> err = PTR_ERR(bio);
> @@ -361,7 +361,7 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
> trace_erofs_readpage(page, true);
>
> bio = erofs_read_raw_page(NULL, page->mapping,
> - page, &last_block, 1, false);
> + page, &last_block, 1, false);
>
> if (IS_ERR(bio))
> return PTR_ERR(bio);
> @@ -371,8 +371,9 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
> }
>
> static int erofs_raw_access_readpages(struct file *filp,
> - struct address_space *mapping,
> - struct list_head *pages, unsigned int nr_pages)
> + struct address_space *mapping,
> + struct list_head *pages,
> + unsigned int nr_pages)
> {
> erofs_off_t last_block;
> struct bio *bio = NULL;
> @@ -389,13 +390,13 @@ static int erofs_raw_access_readpages(struct file *filp,
>
> if (!add_to_page_cache_lru(page, mapping, page->index, gfp)) {
> bio = erofs_read_raw_page(bio, mapping, page,
> - &last_block, nr_pages, true);
> + &last_block, nr_pages, true);
>
> /* all the page errors are ignored when readahead */
> if (IS_ERR(bio)) {
> pr_err("%s, readahead error at page %lu of nid %llu\n",
> - __func__, page->index,
> - EROFS_V(mapping->host)->nid);
> + __func__, page->index,
> + EROFS_V(mapping->host)->nid);
>
> bio = NULL;
> }
> --
> 2.19.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/b14ab748b6c00632bb2234000d96a7e1912e2b1b.1541446384.git.digholebhagyashri%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v5 2/2] staging: erofs: Modify conditional checks
2018-11-05 19:49 ` Bhagyashri P. Dighole
@ 2018-11-06 7:31 ` Gao Xiang
-1 siblings, 0 replies; 8+ messages in thread
From: Gao Xiang @ 2018-11-06 7:31 UTC (permalink / raw)
On 2018/11/6 3:49, Bhagyashri P. Dighole wrote:
> Fix coding style alignment issues detected by checkpatch.pl
> Use ! for NULL test rather than explicitly comparing to NULL.
>
> Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri at gmail.com>
Looks good and good luck...
Reviewed-by: Gao Xiang <gaoxiang25 at huawei.com>
Thanks,
Gao Xiang
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v5 2/2] staging: erofs: Modify conditional checks
@ 2018-11-06 7:31 ` Gao Xiang
0 siblings, 0 replies; 8+ messages in thread
From: Gao Xiang @ 2018-11-06 7:31 UTC (permalink / raw)
To: Bhagyashri P. Dighole
Cc: Chao Yu, Greg Kroah-Hartman, Sasha Levin, Outreachy, linux-erofs
On 2018/11/6 3:49, Bhagyashri P. Dighole wrote:
> Fix coding style alignment issues detected by checkpatch.pl
> Use ! for NULL test rather than explicitly comparing to NULL.
>
> Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri@gmail.com>
Looks good and good luck...
Reviewed-by: Gao Xiang <gaoxiang25@huawei.com>
Thanks,
Gao Xiang
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-11-06 7:32 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-05 19:48 [PATCH v5 1/2] staging: erofs: Modify coding style alignments Bhagyashri P. Dighole
2018-11-05 19:48 ` Bhagyashri P. Dighole
2018-11-05 19:49 ` [PATCH v5 2/2] staging: erofs: Modify conditional checks Bhagyashri P. Dighole
2018-11-05 19:49 ` Bhagyashri P. Dighole
2018-11-06 7:31 ` Gao Xiang
2018-11-06 7:31 ` Gao Xiang
2018-11-05 20:35 ` [Outreachy kernel] [PATCH v5 1/2] staging: erofs: Modify coding style alignments Julia Lawall
2018-11-05 20:35 ` Julia Lawall
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.