* [PATCH] staging: erofs: Fix alignment issues and warnings.
@ 2018-11-04 18:41 Bhagyashri P. Dighole
2018-11-04 18:50 ` [Outreachy kernel] " Julia Lawall
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Bhagyashri P. Dighole @ 2018-11-04 18:41 UTC (permalink / raw)
To: Gao Xiang, Chao Yu, Greg Kroah-Hartman; +Cc: Outreachy
This patch includes modifications for alignment and warnings
as per the coding standards. Also, this patch includes fix
for syntanctical and logical errors.
Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri@gmail.com>
---
drivers/staging/erofs/data.c | 65 ++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
index 6384f73..6fec5e6 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;
@@ -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);
}
@@ -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,16 +167,17 @@ 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))) {
- if (*mpage_ret != NULL)
+ if (*mpage_ret)
put_page(*mpage_ret);
*mpage_ret = NULL;
@@ -192,27 +193,26 @@ 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;
int err;
err = erofs_map_blocks_iter(inode, map, &mpage, flags);
- if (mpage != NULL)
+ if (mpage)
put_page(mpage);
return err;
}
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;
@@ -232,15 +232,15 @@ 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) {
+ if (bio &&
+ /* not continuous */
+ *last_block + 1 != current_block) {
submit_bio_retry:
__submit_bio(bio, REQ_OP_READ, 0);
bio = NULL;
}
- if (bio == NULL) {
+ if (bio) {
struct erofs_map_blocks map = {
.m_la = blknr_to_addr(current_block),
};
@@ -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);
@@ -342,7 +342,7 @@ static inline struct bio *erofs_read_raw_page(
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);
@@ -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;
}
@@ -407,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.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: erofs: Fix alignment issues and warnings.
2018-11-04 18:41 [PATCH] staging: erofs: Fix alignment issues and warnings Bhagyashri P. Dighole
@ 2018-11-04 18:50 ` Julia Lawall
2018-11-04 19:04 ` Sasha Levin
2018-11-04 19:18 ` 答复: " Gaoxiang (OS)
2 siblings, 0 replies; 7+ messages in thread
From: Julia Lawall @ 2018-11-04 18:50 UTC (permalink / raw)
To: Bhagyashri P. Dighole; +Cc: Gao Xiang, Chao Yu, Greg Kroah-Hartman, Outreachy
On Mon, 5 Nov 2018, Bhagyashri P. Dighole wrote:
> This patch includes modifications for alignment and warnings
> as per the coding standards. Also, this patch includes fix
> for syntanctical and logical errors.
A patch should only do one thing. So this should be split up into a
series of patches. What are the logical errors? If you are actually
changing the semantics of something, then it should be made clear what is
wrong and why the change represents a fix.
julia
>
> Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri@gmail.com>
> ---
> drivers/staging/erofs/data.c | 65 ++++++++++++++++++++++----------------------
> 1 file changed, 33 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
> index 6384f73..6fec5e6 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;
> @@ -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);
> }
> @@ -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,16 +167,17 @@ 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))) {
> - if (*mpage_ret != NULL)
> + if (*mpage_ret)
> put_page(*mpage_ret);
> *mpage_ret = NULL;
>
> @@ -192,27 +193,26 @@ 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;
> int err;
>
> err = erofs_map_blocks_iter(inode, map, &mpage, flags);
> - if (mpage != NULL)
> + if (mpage)
> put_page(mpage);
> return err;
> }
> 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;
> @@ -232,15 +232,15 @@ 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) {
> + if (bio &&
> + /* not continuous */
> + *last_block + 1 != current_block) {
> submit_bio_retry:
> __submit_bio(bio, REQ_OP_READ, 0);
> bio = NULL;
> }
>
> - if (bio == NULL) {
> + if (bio) {
> struct erofs_map_blocks map = {
> .m_la = blknr_to_addr(current_block),
> };
> @@ -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);
> @@ -342,7 +342,7 @@ static inline struct bio *erofs_read_raw_page(
> 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);
>
> @@ -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;
> }
> @@ -407,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.7.4
>
> --
> 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/20181104184153.GA16136%40bhagyashri-Lenovo-G570.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: erofs: Fix alignment issues and warnings.
2018-11-04 18:41 [PATCH] staging: erofs: Fix alignment issues and warnings Bhagyashri P. Dighole
2018-11-04 18:50 ` [Outreachy kernel] " Julia Lawall
@ 2018-11-04 19:04 ` Sasha Levin
2018-11-04 19:08 ` Bhagyashri Dighole
2018-11-04 19:18 ` 答复: " Gaoxiang (OS)
2 siblings, 1 reply; 7+ messages in thread
From: Sasha Levin @ 2018-11-04 19:04 UTC (permalink / raw)
To: Bhagyashri P. Dighole; +Cc: Gao Xiang, Chao Yu, Greg Kroah-Hartman, Outreachy
On Mon, Nov 05, 2018 at 12:11:54AM +0530, Bhagyashri P. Dighole wrote:
>@@ -232,15 +232,15 @@ 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) {
>+ if (bio &&
>+ /* not continuous */
>+ *last_block + 1 != current_block) {
> submit_bio_retry:
> __submit_bio(bio, REQ_OP_READ, 0);
> bio = NULL;
> }
>
>- if (bio == NULL) {
>+ if (bio) {
The condition was inverted here, which is incorrect.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Outreachy kernel] [PATCH] staging: erofs: Fix alignment issues and warnings.
2018-11-04 19:04 ` Sasha Levin
@ 2018-11-04 19:08 ` Bhagyashri Dighole
0 siblings, 0 replies; 7+ messages in thread
From: Bhagyashri Dighole @ 2018-11-04 19:08 UTC (permalink / raw)
To: Sasha Levin; +Cc: Gao Xiang, Chao Yu, Greg Kroah-Hartman, Outreachy
[-- Attachment #1: Type: text/plain, Size: 807 bytes --]
Ok, I'll check it out.
On Mon, Nov 5, 2018, 12:34 AM Sasha Levin <sashal@kernel.org> wrote:
> On Mon, Nov 05, 2018 at 12:11:54AM +0530, Bhagyashri P. Dighole wrote:
> >@@ -232,15 +232,15 @@ 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) {
> >+ if (bio &&
> >+ /* not continuous */
> >+ *last_block + 1 != current_block) {
> > submit_bio_retry:
> > __submit_bio(bio, REQ_OP_READ, 0);
> > bio = NULL;
> > }
> >
> >- if (bio == NULL) {
> >+ if (bio) {
>
> The condition was inverted here, which is incorrect.
>
> --
> Thanks,
> Sasha
>
[-- Attachment #2: Type: text/html, Size: 1256 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* 答复: [PATCH] staging: erofs: Fix alignment issues and warnings.
2018-11-04 18:41 [PATCH] staging: erofs: Fix alignment issues and warnings Bhagyashri P. Dighole
2018-11-04 18:50 ` [Outreachy kernel] " Julia Lawall
2018-11-04 19:04 ` Sasha Levin
@ 2018-11-04 19:18 ` Gaoxiang (OS)
2018-11-04 19:39 ` Bhagyashri Dighole
2 siblings, 1 reply; 7+ messages in thread
From: Gaoxiang (OS) @ 2018-11-04 19:18 UTC (permalink / raw)
To: Bhagyashri P. Dighole; +Cc: Outreachy, Yuchao (T), Greg Kroah-Hartman
Hi Bhagyashri,
Thanks for your patch and I think it is helpful to fix erofs coding style as the kernel suggested.
could you please fix your patch as Julia / Sasha pointed out.
p.s. could you please kindly Cc: linux-erofs mailing list linux-erofs@lists.ozlabs.org as well?
since I am very hard to access my @huawei.com conveniently off work (usually at the weekend).
I have to do some special to reply at the weekend if some email didn't post to the linux-erofs mailing list,
and I have to use M$ Outlook email client like this.... :(
Thanks,
Gao Xiang
________________________________________
发件人: Bhagyashri P. Dighole [digholebhagyashri@gmail.com]
发送时间: 2018年11月5日 2:41
收件人: Gaoxiang (OS); Yuchao (T); Greg Kroah-Hartman
抄送: Outreachy
主题: [PATCH] staging: erofs: Fix alignment issues and warnings.
This patch includes modifications for alignment and warnings
as per the coding standards. Also, this patch includes fix
for syntanctical and logical errors.
Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri@gmail.com>
---
drivers/staging/erofs/data.c | 65 ++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
index 6384f73..6fec5e6 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;
@@ -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);
}
@@ -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,16 +167,17 @@ 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))) {
- if (*mpage_ret != NULL)
+ if (*mpage_ret)
put_page(*mpage_ret);
*mpage_ret = NULL;
@@ -192,27 +193,26 @@ 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;
int err;
err = erofs_map_blocks_iter(inode, map, &mpage, flags);
- if (mpage != NULL)
+ if (mpage)
put_page(mpage);
return err;
}
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;
@@ -232,15 +232,15 @@ 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) {
+ if (bio &&
+ /* not continuous */
+ *last_block + 1 != current_block) {
submit_bio_retry:
__submit_bio(bio, REQ_OP_READ, 0);
bio = NULL;
}
- if (bio == NULL) {
+ if (bio) {
struct erofs_map_blocks map = {
.m_la = blknr_to_addr(current_block),
};
@@ -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);
@@ -342,7 +342,7 @@ static inline struct bio *erofs_read_raw_page(
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);
@@ -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;
}
@@ -407,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.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] staging: erofs: Fix alignment issues and warnings.
2018-11-04 19:18 ` 答复: " Gaoxiang (OS)
@ 2018-11-04 19:39 ` Bhagyashri Dighole
0 siblings, 0 replies; 7+ messages in thread
From: Bhagyashri Dighole @ 2018-11-04 19:39 UTC (permalink / raw)
To: Gaoxiang (OS); +Cc: Outreachy, Yuchao (T), Greg Kroah-Hartman
[-- Attachment #1: Type: text/plain, Size: 9819 bytes --]
Hi Gao,
Thank you for your suggestions.
I will resubmit the patch as Julia and Sasha pointed out. I will also add
linux-erofs mailing list in CC.
Regards
Bhagyashri
On Mon, Nov 5, 2018, 12:48 AM Gaoxiang (OS) <gaoxiang25@huawei.com> wrote:
> Hi Bhagyashri,
>
> Thanks for your patch and I think it is helpful to fix erofs coding style
> as the kernel suggested.
>
> could you please fix your patch as Julia / Sasha pointed out.
>
> p.s. could you please kindly Cc: linux-erofs mailing list
> linux-erofs@lists.ozlabs.org as well?
> since I am very hard to access my @huawei.com conveniently off work
> (usually at the weekend).
>
> I have to do some special to reply at the weekend if some email didn't
> post to the linux-erofs mailing list,
> and I have to use M$ Outlook email client like this.... :(
>
> Thanks,
> Gao Xiang
>
> ________________________________________
> 发件人: Bhagyashri P. Dighole [digholebhagyashri@gmail.com]
> 发送时间: 2018年11月5日 2:41
> 收件人: Gaoxiang (OS); Yuchao (T); Greg Kroah-Hartman
> 抄送: Outreachy
> 主题: [PATCH] staging: erofs: Fix alignment issues and warnings.
>
> This patch includes modifications for alignment and warnings
> as per the coding standards. Also, this patch includes fix
> for syntanctical and logical errors.
>
> Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri@gmail.com>
> ---
> drivers/staging/erofs/data.c | 65
> ++++++++++++++++++++++----------------------
> 1 file changed, 33 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
> index 6384f73..6fec5e6 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;
> @@ -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);
> }
> @@ -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,16 +167,17 @@ 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))) {
> - if (*mpage_ret != NULL)
> + if (*mpage_ret)
> put_page(*mpage_ret);
> *mpage_ret = NULL;
>
> @@ -192,27 +193,26 @@ 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;
> int err;
>
> err = erofs_map_blocks_iter(inode, map, &mpage, flags);
> - if (mpage != NULL)
> + if (mpage)
> put_page(mpage);
> return err;
> }
> 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;
> @@ -232,15 +232,15 @@ 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) {
> + if (bio &&
> + /* not continuous */
> + *last_block + 1 != current_block) {
> submit_bio_retry:
> __submit_bio(bio, REQ_OP_READ, 0);
> bio = NULL;
> }
>
> - if (bio == NULL) {
> + if (bio) {
> struct erofs_map_blocks map = {
> .m_la = blknr_to_addr(current_block),
> };
> @@ -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);
> @@ -342,7 +342,7 @@ static inline struct bio *erofs_read_raw_page(
> 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);
>
> @@ -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;
> }
> @@ -407,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.7.4
[-- Attachment #2: Type: text/html, Size: 12232 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] staging: erofs: Fix alignment issues and warnings.
@ 2018-11-04 18:49 Bhagyashri P. Dighole
0 siblings, 0 replies; 7+ messages in thread
From: Bhagyashri P. Dighole @ 2018-11-04 18:49 UTC (permalink / raw)
To: Sasha Levin; +Cc: outreachy-kernel
This patch includes modifications for alignment and warnings
as per the coding standards. Also, this patch includes fix
for syntanctical and logical errors.
Signed-off-by: Bhagyashri P. Dighole <digholebhagyashri@gmail.com>
---
drivers/staging/erofs/data.c | 65 ++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c
index 6384f73..6fec5e6 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;
@@ -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);
}
@@ -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,16 +167,17 @@ 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))) {
- if (*mpage_ret != NULL)
+ if (*mpage_ret)
put_page(*mpage_ret);
*mpage_ret = NULL;
@@ -192,27 +193,26 @@ 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;
int err;
err = erofs_map_blocks_iter(inode, map, &mpage, flags);
- if (mpage != NULL)
+ if (mpage)
put_page(mpage);
return err;
}
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;
@@ -232,15 +232,15 @@ 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) {
+ if (bio &&
+ /* not continuous */
+ *last_block + 1 != current_block) {
submit_bio_retry:
__submit_bio(bio, REQ_OP_READ, 0);
bio = NULL;
}
- if (bio == NULL) {
+ if (bio) {
struct erofs_map_blocks map = {
.m_la = blknr_to_addr(current_block),
};
@@ -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);
@@ -342,7 +342,7 @@ static inline struct bio *erofs_read_raw_page(
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);
@@ -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;
}
@@ -407,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.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-11-04 19:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-04 18:41 [PATCH] staging: erofs: Fix alignment issues and warnings Bhagyashri P. Dighole
2018-11-04 18:50 ` [Outreachy kernel] " Julia Lawall
2018-11-04 19:04 ` Sasha Levin
2018-11-04 19:08 ` Bhagyashri Dighole
2018-11-04 19:18 ` 答复: " Gaoxiang (OS)
2018-11-04 19:39 ` Bhagyashri Dighole
2018-11-04 18:49 Bhagyashri P. Dighole
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.