From: Chao Yu <yuchao0@huawei.com> To: Gao Xiang <hsiangkao@aol.com>, Chao Yu <chao@kernel.org>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org> Cc: <devel@driverdev.osuosl.org>, <linux-erofs@lists.ozlabs.org>, <linux-kernel@vger.kernel.org> Subject: Re: [PATCH 1/2] staging: erofs: fix compile error without built-in decompression support Date: Mon, 30 Jul 2018 10:07:12 +0800 [thread overview] Message-ID: <5a396128-822f-5232-f3ee-1c5ac6524380@huawei.com> (raw) In-Reply-To: <20180729053459.34140-1-hsiangkao@aol.com> On 2018/7/29 13:34, Gao Xiang via Linux-erofs wrote: > This patch fixes incorrect code snippets due to spilt code > into small patches by mistake. > > Link: https://lists.01.org/pipermail/kbuild-all/2018-July/050747.html > Link: https://lists.01.org/pipermail/kbuild-all/2018-July/050750.html > Reported-by: kbuild test robot <lkp@intel.com> > Signed-off-by: Gao Xiang <gaoxiang25@huawei.com> > --- > I test several Kconfig option combinations and all these > combinations are successfully compiled. > > Hi Chao, > Could you please review this two patches first before merging > into staging-next tree? Hi Xiang, For this compiler issue, I think we only need to cover erofs_shrink_workstation with marco CONFIG_EROFS_FS_ZIP, other modification like symbol name change or relocate erofs_shrink_workstation are with other reason, so how about separate them into different patches? Thanks, > > Thanks, > Gao Xiang > > drivers/staging/erofs/internal.h | 4 ++-- > drivers/staging/erofs/super.c | 2 +- > drivers/staging/erofs/unzip_vle.c | 7 ++++--- > drivers/staging/erofs/utils.c | 7 ++++--- > 4 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h > index 669f93ae6920..367b39fe46e5 100644 > --- a/drivers/staging/erofs/internal.h > +++ b/drivers/staging/erofs/internal.h > @@ -260,9 +260,9 @@ static inline void erofs_workstation_cleanup_all(struct super_block *sb) > #ifdef EROFS_FS_HAS_MANAGED_CACHE > #define EROFS_UNALLOCATED_CACHED_PAGE ((void *)0x5F0EF00D) > > -extern int try_to_free_all_cached_pages(struct erofs_sb_info *sbi, > +extern int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi, > struct erofs_workgroup *egrp); > -extern int try_to_free_cached_page(struct address_space *mapping, > +extern int erofs_try_to_free_cached_page(struct address_space *mapping, > struct page *page); > #endif > > diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c > index 97da5c8a8ef3..1aec509c805f 100644 > --- a/drivers/staging/erofs/super.c > +++ b/drivers/staging/erofs/super.c > @@ -269,7 +269,7 @@ static int managed_cache_releasepage(struct page *page, gfp_t gfp_mask) > BUG_ON(mapping->a_ops != &managed_cache_aops); > > if (PagePrivate(page)) > - ret = try_to_free_cached_page(mapping, page); > + ret = erofs_try_to_free_cached_page(mapping, page); > > return ret; > } > diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c > index 7671fe8194ce..0e410a228cd4 100644 > --- a/drivers/staging/erofs/unzip_vle.c > +++ b/drivers/staging/erofs/unzip_vle.c > @@ -131,8 +131,8 @@ static bool grab_managed_cache_pages(struct address_space *mapping, > } > > /* called by erofs_shrinker to get rid of all compressed_pages */ > -int try_to_free_all_cached_pages(struct erofs_sb_info *sbi, > - struct erofs_workgroup *egrp) > +int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi, > + struct erofs_workgroup *egrp) > { > struct z_erofs_vle_workgroup *const grp = > container_of(egrp, struct z_erofs_vle_workgroup, obj); > @@ -166,7 +166,8 @@ int try_to_free_all_cached_pages(struct erofs_sb_info *sbi, > return 0; > } > > -int try_to_free_cached_page(struct address_space *mapping, struct page *page) > +int erofs_try_to_free_cached_page(struct address_space *mapping, > + struct page *page) > { > struct erofs_sb_info *const sbi = EROFS_SB(mapping->host->i_sb); > const unsigned int clusterpages = erofs_clusterpages(sbi); > diff --git a/drivers/staging/erofs/utils.c b/drivers/staging/erofs/utils.c > index ee70bb9e1636..595cf90af9bb 100644 > --- a/drivers/staging/erofs/utils.c > +++ b/drivers/staging/erofs/utils.c > @@ -160,7 +160,7 @@ unsigned long erofs_shrink_workstation(struct erofs_sb_info *sbi, > } > > #ifdef EROFS_FS_HAS_MANAGED_CACHE > - if (try_to_free_all_cached_pages(sbi, grp)) > + if (erofs_try_to_free_all_cached_pages(sbi, grp)) > goto skip; > > erofs_workgroup_unfreeze(grp, 1); > @@ -247,7 +247,9 @@ unsigned long erofs_shrink_scan(struct shrinker *shrink, > spin_unlock(&erofs_sb_list_lock); > sbi->shrinker_run_no = run_no; > > - /* add scan handlers here */ > +#ifdef CONFIG_EROFS_FS_ZIP > + freed += erofs_shrink_workstation(sbi, nr, false); > +#endif > > spin_lock(&erofs_sb_list_lock); > /* Get the next list element before we move this one */ > @@ -260,7 +262,6 @@ unsigned long erofs_shrink_scan(struct shrinker *shrink, > list_move_tail(&sbi->list, &erofs_sb_list); > mutex_unlock(&sbi->umount_mutex); > > - freed += erofs_shrink_workstation(sbi, nr, false); > if (freed >= nr) > break; > } >
WARNING: multiple messages have this Message-ID (diff)
From: yuchao0@huawei.com (Chao Yu) Subject: [PATCH 1/2] staging: erofs: fix compile error without built-in decompression support Date: Mon, 30 Jul 2018 10:07:12 +0800 [thread overview] Message-ID: <5a396128-822f-5232-f3ee-1c5ac6524380@huawei.com> (raw) In-Reply-To: <20180729053459.34140-1-hsiangkao@aol.com> On 2018/7/29 13:34, Gao Xiang via Linux-erofs wrote: > This patch fixes incorrect code snippets due to spilt code > into small patches by mistake. > > Link: https://lists.01.org/pipermail/kbuild-all/2018-July/050747.html > Link: https://lists.01.org/pipermail/kbuild-all/2018-July/050750.html > Reported-by: kbuild test robot <lkp at intel.com> > Signed-off-by: Gao Xiang <gaoxiang25 at huawei.com> > --- > I test several Kconfig option combinations and all these > combinations are successfully compiled. > > Hi Chao, > Could you please review this two patches first before merging > into staging-next tree? Hi Xiang, For this compiler issue, I think we only need to cover erofs_shrink_workstation with marco CONFIG_EROFS_FS_ZIP, other modification like symbol name change or relocate erofs_shrink_workstation are with other reason, so how about separate them into different patches? Thanks, > > Thanks, > Gao Xiang > > drivers/staging/erofs/internal.h | 4 ++-- > drivers/staging/erofs/super.c | 2 +- > drivers/staging/erofs/unzip_vle.c | 7 ++++--- > drivers/staging/erofs/utils.c | 7 ++++--- > 4 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h > index 669f93ae6920..367b39fe46e5 100644 > --- a/drivers/staging/erofs/internal.h > +++ b/drivers/staging/erofs/internal.h > @@ -260,9 +260,9 @@ static inline void erofs_workstation_cleanup_all(struct super_block *sb) > #ifdef EROFS_FS_HAS_MANAGED_CACHE > #define EROFS_UNALLOCATED_CACHED_PAGE ((void *)0x5F0EF00D) > > -extern int try_to_free_all_cached_pages(struct erofs_sb_info *sbi, > +extern int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi, > struct erofs_workgroup *egrp); > -extern int try_to_free_cached_page(struct address_space *mapping, > +extern int erofs_try_to_free_cached_page(struct address_space *mapping, > struct page *page); > #endif > > diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c > index 97da5c8a8ef3..1aec509c805f 100644 > --- a/drivers/staging/erofs/super.c > +++ b/drivers/staging/erofs/super.c > @@ -269,7 +269,7 @@ static int managed_cache_releasepage(struct page *page, gfp_t gfp_mask) > BUG_ON(mapping->a_ops != &managed_cache_aops); > > if (PagePrivate(page)) > - ret = try_to_free_cached_page(mapping, page); > + ret = erofs_try_to_free_cached_page(mapping, page); > > return ret; > } > diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c > index 7671fe8194ce..0e410a228cd4 100644 > --- a/drivers/staging/erofs/unzip_vle.c > +++ b/drivers/staging/erofs/unzip_vle.c > @@ -131,8 +131,8 @@ static bool grab_managed_cache_pages(struct address_space *mapping, > } > > /* called by erofs_shrinker to get rid of all compressed_pages */ > -int try_to_free_all_cached_pages(struct erofs_sb_info *sbi, > - struct erofs_workgroup *egrp) > +int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi, > + struct erofs_workgroup *egrp) > { > struct z_erofs_vle_workgroup *const grp = > container_of(egrp, struct z_erofs_vle_workgroup, obj); > @@ -166,7 +166,8 @@ int try_to_free_all_cached_pages(struct erofs_sb_info *sbi, > return 0; > } > > -int try_to_free_cached_page(struct address_space *mapping, struct page *page) > +int erofs_try_to_free_cached_page(struct address_space *mapping, > + struct page *page) > { > struct erofs_sb_info *const sbi = EROFS_SB(mapping->host->i_sb); > const unsigned int clusterpages = erofs_clusterpages(sbi); > diff --git a/drivers/staging/erofs/utils.c b/drivers/staging/erofs/utils.c > index ee70bb9e1636..595cf90af9bb 100644 > --- a/drivers/staging/erofs/utils.c > +++ b/drivers/staging/erofs/utils.c > @@ -160,7 +160,7 @@ unsigned long erofs_shrink_workstation(struct erofs_sb_info *sbi, > } > > #ifdef EROFS_FS_HAS_MANAGED_CACHE > - if (try_to_free_all_cached_pages(sbi, grp)) > + if (erofs_try_to_free_all_cached_pages(sbi, grp)) > goto skip; > > erofs_workgroup_unfreeze(grp, 1); > @@ -247,7 +247,9 @@ unsigned long erofs_shrink_scan(struct shrinker *shrink, > spin_unlock(&erofs_sb_list_lock); > sbi->shrinker_run_no = run_no; > > - /* add scan handlers here */ > +#ifdef CONFIG_EROFS_FS_ZIP > + freed += erofs_shrink_workstation(sbi, nr, false); > +#endif > > spin_lock(&erofs_sb_list_lock); > /* Get the next list element before we move this one */ > @@ -260,7 +262,6 @@ unsigned long erofs_shrink_scan(struct shrinker *shrink, > list_move_tail(&sbi->list, &erofs_sb_list); > mutex_unlock(&sbi->umount_mutex); > > - freed += erofs_shrink_workstation(sbi, nr, false); > if (freed >= nr) > break; > } >
next prev parent reply other threads:[~2018-07-30 2:07 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-31 11:06 [NOMERGE] [RFC PATCH 00/12] erofs: introduce erofs file system Gao Xiang 2018-06-01 7:48 ` Richard Weinberger 2018-06-01 9:11 ` Gao Xiang 2018-06-01 9:28 ` Richard Weinberger 2018-06-01 11:16 ` Gao Xiang 2018-06-07 10:26 ` Pavel Machek 2018-07-27 0:55 ` Joey Pabalinas 2018-07-27 0:57 ` Joey Pabalinas 2018-07-26 12:21 ` [PATCH 00/25] staging: " Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 01/25] staging: erofs: add on-disk layout Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 02/25] staging: erofs: add erofs in-memory stuffs Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 03/25] staging: erofs: add super block operations Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 04/25] staging: erofs: add raw address_space operations Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 05/25] staging: erofs: add inode operations Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 06/25] staging: erofs: add directory operations Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 07/25] staging: erofs: add namei functions Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 08/25] staging: erofs: update Kconfig and Makefile Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 09/25] staging: erofs: introduce xattr & acl support Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 10/25] staging: erofs: support special inode Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 11/25] staging: erofs: introduce error injection infrastructure Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 12/25] staging: erofs: support tracepoint Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 13/25] staging: erofs: <linux/tagptr.h>: introduce tagged pointer Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 14/25] staging: erofs: introduce pagevec for unzip subsystem Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 15/25] staging: erofs: add erofs_map_blocks_iter Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 16/25] staging: erofs: add erofs_allocpage Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 17/25] staging: erofs: globalize prepare_bio and __submit_bio Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 18/25] staging: erofs: introduce a customized LZ4 decompression Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 19/25] staging: erofs: add a generic z_erofs VLE decompressor Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 20/25] staging: erofs: introduce superblock registration Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 21/25] staging: erofs: introduce erofs shrinker Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 22/25] staging: erofs: introduce workstation for decompression Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 23/25] staging: erofs: introduce VLE decompression support Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 24/25] staging: erofs: introduce cached decompression Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 25/25] staging: erofs: add a TODO and update MAINTAINERS for staging Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-28 7:10 ` [PATCH] staging: erofs: fix a compile warning of Z_EROFS_VLE_VMAP_ONSTACK_PAGES Gao Xiang 2018-07-28 7:10 ` Gao Xiang 2018-07-28 10:43 ` Chao Yu 2018-07-28 10:43 ` Chao Yu 2018-07-29 5:34 ` [PATCH 1/2] staging: erofs: fix compile error without built-in decompression support Gao Xiang 2018-07-29 5:34 ` Gao Xiang 2018-07-29 5:37 ` [PATCH 2/2] staging: erofs: fix conditional uninitialized `pcn' in z_erofs_map_blocks_iter Gao Xiang 2018-07-29 5:37 ` Gao Xiang 2018-07-30 1:51 ` [PATCH] staging: erofs: use the wrapped PTR_ERR_OR_ZERO instead of open code Gao Xiang 2018-07-30 1:51 ` Gao Xiang 2018-07-30 6:58 ` Chao Yu 2018-07-30 6:58 ` Chao Yu 2018-08-01 6:38 ` [PATCH 1/2] staging: erofs: add the missing break in z_erofs_map_blocks_iter Gao Xiang 2018-08-01 6:38 ` Gao Xiang 2018-08-01 6:38 ` [PATCH 2/2] staging: erofs: remove a redundant marco in xattr Gao Xiang 2018-08-01 6:38 ` Gao Xiang 2018-08-01 9:02 ` [PATCH 1/2] staging: erofs: add the missing break in z_erofs_map_blocks_iter Dan Carpenter 2018-08-01 9:02 ` Dan Carpenter 2018-08-01 9:19 ` Gao Xiang 2018-08-01 9:19 ` Gao Xiang 2018-08-01 9:36 ` [PATCH RESEND " Gao Xiang 2018-08-01 9:36 ` Gao Xiang 2018-08-01 11:36 ` Dan Carpenter 2018-08-01 11:36 ` Dan Carpenter 2018-08-01 12:08 ` Gao Xiang 2018-08-01 12:08 ` Gao Xiang 2018-07-30 2:07 ` [PATCH 2/2] staging: erofs: fix conditional uninitialized `pcn' " Chao Yu 2018-07-30 2:07 ` Chao Yu 2018-07-30 2:07 ` Chao Yu [this message] 2018-07-30 2:07 ` [PATCH 1/2] staging: erofs: fix compile error without built-in decompression support Chao Yu 2018-07-30 2:32 ` Gao Xiang 2018-07-30 2:32 ` Gao Xiang 2018-07-30 3:07 ` Chao Yu 2018-07-30 3:07 ` Chao Yu 2018-07-30 3:55 ` Gao Xiang 2018-07-30 3:55 ` Gao Xiang 2018-07-30 3:34 ` [FOR INTERNAL REVIEW] [PATCH RESEND 1/3] staging: erofs: fix incorrect code in erofs_shrink_scan Gao Xiang 2018-07-30 3:34 ` [FOR INTERNAL REVIEW] [PATCH RESEND 2/3] staging: erofs: add 'erofs_' prefixes for try_to_free_(all_)cached_page(s) Gao Xiang 2018-07-30 6:57 ` Chao Yu 2018-07-30 3:34 ` [FOR INTERNAL REVIEW] [PATCH RESEND 3/3] staging: erofs: fix conditional uninitialized `pcn' in z_erofs_map_blocks_iter Gao Xiang 2018-07-30 6:56 ` [FOR INTERNAL REVIEW] [PATCH RESEND 1/3] staging: erofs: fix incorrect code in erofs_shrink_scan Chao Yu 2018-07-27 0:25 ` [PATCH 00/25] staging: erofs: introduce erofs file system Christian Kujau 2018-07-27 1:39 ` Gao Xiang 2018-07-27 1:39 ` Gao Xiang 2018-07-27 1:56 ` Gao Xiang 2018-07-27 1:56 ` Gao Xiang 2018-07-28 7:25 ` Greg Kroah-Hartman 2018-07-28 7:25 ` Greg Kroah-Hartman 2018-07-28 9:33 ` Gao Xiang 2018-07-28 9:33 ` Gao Xiang 2018-07-28 10:34 ` Chao Yu 2018-07-28 10:34 ` Chao Yu
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=5a396128-822f-5232-f3ee-1c5ac6524380@huawei.com \ --to=yuchao0@huawei.com \ --cc=chao@kernel.org \ --cc=devel@driverdev.osuosl.org \ --cc=gregkh@linuxfoundation.org \ --cc=hsiangkao@aol.com \ --cc=linux-erofs@lists.ozlabs.org \ --cc=linux-kernel@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.