redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: erofs: fix compile error without built-in decompression support 

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Gao Xiang 2018-07-29 13:34:58 +08:00 committed by Greg Kroah-Hartman
parent 6d4abf1c0e
commit 47e541a17e
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/erofs/internal.h
View File

@ -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

2
drivers/staging/erofs/super.c
View File

@ -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;
}

7
drivers/staging/erofs/unzip_vle.c
View File

@ -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);

7
drivers/staging/erofs/utils.c
View File

@ -160,7 +160,7 @@ skip:
}
#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;
}