Commit f0950b02 authored by Bhagyashri P. Dighole's avatar Bhagyashri P. Dighole Committed by Greg Kroah-Hartman

staging: erofs: Modify coding style alignments

Fix coding style alignment issues detected by checkpatch.pl
Matched alignments with parenthesis.
Signed-off-by: default avatarBhagyashri P. Dighole <digholebhagyashri@gmail.com>
Reviewed-by: default avatarGao Xiang <gaoxiang25@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c49d3f3f
...@@ -40,7 +40,7 @@ static inline void read_endio(struct bio *bio) ...@@ -40,7 +40,7 @@ static inline void read_endio(struct bio *bio)
/* prio -- true is used for dir */ /* prio -- true is used for dir */
struct page *__erofs_get_meta_page(struct super_block *sb, 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 inode *const bd_inode = sb->s_bdev->bd_inode;
struct address_space *const mapping = bd_inode->i_mapping; struct address_space *const mapping = bd_inode->i_mapping;
...@@ -76,7 +76,7 @@ struct page *__erofs_get_meta_page(struct super_block *sb, ...@@ -76,7 +76,7 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
} }
__submit_bio(bio, REQ_OP_READ, __submit_bio(bio, REQ_OP_READ,
REQ_META | (prio ? REQ_PRIO : 0)); REQ_META | (prio ? REQ_PRIO : 0));
lock_page(page); lock_page(page);
...@@ -107,8 +107,8 @@ struct page *__erofs_get_meta_page(struct super_block *sb, ...@@ -107,8 +107,8 @@ struct page *__erofs_get_meta_page(struct super_block *sb,
} }
static int erofs_map_blocks_flatmode(struct inode *inode, static int erofs_map_blocks_flatmode(struct inode *inode,
struct erofs_map_blocks *map, struct erofs_map_blocks *map,
int flags) int flags)
{ {
int err = 0; int err = 0;
erofs_blk_t nblocks, lastblk; erofs_blk_t nblocks, lastblk;
...@@ -151,7 +151,7 @@ static int erofs_map_blocks_flatmode(struct inode *inode, ...@@ -151,7 +151,7 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
map->m_flags |= EROFS_MAP_META; map->m_flags |= EROFS_MAP_META;
} else { } else {
errln("internal error @ nid: %llu (size %llu), m_la 0x%llx", 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); DBG_BUGON(1);
err = -EIO; err = -EIO;
goto err_out; goto err_out;
...@@ -167,12 +167,13 @@ static int erofs_map_blocks_flatmode(struct inode *inode, ...@@ -167,12 +167,13 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
#ifdef CONFIG_EROFS_FS_ZIP #ifdef CONFIG_EROFS_FS_ZIP
extern int z_erofs_map_blocks_iter(struct inode *, extern int z_erofs_map_blocks_iter(struct inode *,
struct erofs_map_blocks *, struct page **, int); struct erofs_map_blocks *,
struct page **, int);
#endif #endif
int erofs_map_blocks_iter(struct inode *inode, int erofs_map_blocks_iter(struct inode *inode,
struct erofs_map_blocks *map, struct erofs_map_blocks *map,
struct page **mpage_ret, int flags) struct page **mpage_ret, int flags)
{ {
/* by default, reading raw data never use erofs_map_blocks_iter */ /* by default, reading raw data never use erofs_map_blocks_iter */
if (unlikely(!is_inode_layout_compression(inode))) { if (unlikely(!is_inode_layout_compression(inode))) {
...@@ -192,7 +193,7 @@ int erofs_map_blocks_iter(struct inode *inode, ...@@ -192,7 +193,7 @@ int erofs_map_blocks_iter(struct inode *inode,
} }
int erofs_map_blocks(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))) { if (unlikely(is_inode_layout_compression(inode))) {
struct page *mpage = NULL; struct page *mpage = NULL;
...@@ -206,13 +207,12 @@ int erofs_map_blocks(struct inode *inode, ...@@ -206,13 +207,12 @@ int erofs_map_blocks(struct inode *inode,
return erofs_map_blocks_flatmode(inode, map, flags); return erofs_map_blocks_flatmode(inode, map, flags);
} }
static inline struct bio *erofs_read_raw_page( static inline struct bio *erofs_read_raw_page(struct bio *bio,
struct bio *bio, struct address_space *mapping,
struct address_space *mapping, struct page *page,
struct page *page, erofs_off_t *last_block,
erofs_off_t *last_block, unsigned int nblocks,
unsigned int nblocks, bool ra)
bool ra)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
erofs_off_t current_block = (erofs_off_t)page->index; erofs_off_t current_block = (erofs_off_t)page->index;
...@@ -233,8 +233,8 @@ static inline struct bio *erofs_read_raw_page( ...@@ -233,8 +233,8 @@ static inline struct bio *erofs_read_raw_page(
/* note that for readpage case, bio also equals to NULL */ /* note that for readpage case, bio also equals to NULL */
if (bio != NULL && if (bio != NULL &&
/* not continuous */ /* not continuous */
*last_block + 1 != current_block) { *last_block + 1 != current_block) {
submit_bio_retry: submit_bio_retry:
__submit_bio(bio, REQ_OP_READ, 0); __submit_bio(bio, REQ_OP_READ, 0);
bio = NULL; bio = NULL;
...@@ -307,7 +307,7 @@ static inline struct bio *erofs_read_raw_page( ...@@ -307,7 +307,7 @@ static inline struct bio *erofs_read_raw_page(
nblocks = BIO_MAX_PAGES; nblocks = BIO_MAX_PAGES;
bio = erofs_grab_bio(inode->i_sb, bio = erofs_grab_bio(inode->i_sb,
blknr, nblocks, read_endio, false); blknr, nblocks, read_endio, false);
if (IS_ERR(bio)) { if (IS_ERR(bio)) {
err = PTR_ERR(bio); err = PTR_ERR(bio);
...@@ -361,7 +361,7 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page) ...@@ -361,7 +361,7 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
trace_erofs_readpage(page, true); trace_erofs_readpage(page, true);
bio = erofs_read_raw_page(NULL, page->mapping, bio = erofs_read_raw_page(NULL, page->mapping,
page, &last_block, 1, false); page, &last_block, 1, false);
if (IS_ERR(bio)) if (IS_ERR(bio))
return PTR_ERR(bio); return PTR_ERR(bio);
...@@ -371,8 +371,9 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page) ...@@ -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, static int erofs_raw_access_readpages(struct file *filp,
struct address_space *mapping, struct address_space *mapping,
struct list_head *pages, unsigned int nr_pages) struct list_head *pages,
unsigned int nr_pages)
{ {
erofs_off_t last_block; erofs_off_t last_block;
struct bio *bio = NULL; struct bio *bio = NULL;
...@@ -389,13 +390,13 @@ static int erofs_raw_access_readpages(struct file *filp, ...@@ -389,13 +390,13 @@ static int erofs_raw_access_readpages(struct file *filp,
if (!add_to_page_cache_lru(page, mapping, page->index, gfp)) { if (!add_to_page_cache_lru(page, mapping, page->index, gfp)) {
bio = erofs_read_raw_page(bio, mapping, page, 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 */ /* all the page errors are ignored when readahead */
if (IS_ERR(bio)) { if (IS_ERR(bio)) {
pr_err("%s, readahead error at page %lu of nid %llu\n", pr_err("%s, readahead error at page %lu of nid %llu\n",
__func__, page->index, __func__, page->index,
EROFS_V(mapping->host)->nid); EROFS_V(mapping->host)->nid);
bio = NULL; bio = NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment