UBIFS: fix checkpatch.pl warnings
These are mostly long lines and wrong indentation warning fixes. But also there are two volatile variables and checkpatch.pl complains about them: WARNING: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt + volatile int gc_seq; WARNING: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt + volatile int gced_lnum; Well, we anyway use smp_wmb() for c->gc_seq and c->gced_lnum, so these 'volatile' modifiers can be just dropped. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Родитель
6a4a9b438f
Коммит
f92b982680
|
@ -703,7 +703,8 @@ void dbg_dump_lpt_info(struct ubifs_info *c)
|
|||
printk(KERN_DEBUG "\tLPT root is at %d:%d\n", c->lpt_lnum, c->lpt_offs);
|
||||
printk(KERN_DEBUG "\tLPT head is at %d:%d\n",
|
||||
c->nhead_lnum, c->nhead_offs);
|
||||
printk(KERN_DEBUG "\tLPT ltab is at %d:%d\n", c->ltab_lnum, c->ltab_offs);
|
||||
printk(KERN_DEBUG "\tLPT ltab is at %d:%d\n",
|
||||
c->ltab_lnum, c->ltab_offs);
|
||||
if (c->big_lpt)
|
||||
printk(KERN_DEBUG "\tLPT lsave is at %d:%d\n",
|
||||
c->lsave_lnum, c->lsave_offs);
|
||||
|
|
|
@ -72,8 +72,8 @@ static int read_block(struct inode *inode, void *addr, unsigned int block,
|
|||
return err;
|
||||
}
|
||||
|
||||
ubifs_assert(le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum);
|
||||
|
||||
ubifs_assert(le64_to_cpu(dn->ch.sqnum) >
|
||||
ubifs_inode(inode)->creat_sqnum);
|
||||
len = le32_to_cpu(dn->size);
|
||||
if (len <= 0 || len > UBIFS_BLOCK_SIZE)
|
||||
goto dump;
|
||||
|
|
|
@ -1220,7 +1220,7 @@ int ubifs_jnl_truncate(struct ubifs_info *c, const struct inode *inode,
|
|||
data_key_init(c, &key, inum, blk);
|
||||
|
||||
bit = old_size & (UBIFS_BLOCK_SIZE - 1);
|
||||
blk = (old_size >> UBIFS_BLOCK_SHIFT) - (bit ? 0: 1);
|
||||
blk = (old_size >> UBIFS_BLOCK_SHIFT) - (bit ? 0 : 1);
|
||||
data_key_init(c, &to_key, inum, blk);
|
||||
|
||||
err = ubifs_tnc_remove_range(c, &key, &to_key);
|
||||
|
|
|
@ -2245,8 +2245,7 @@ int ubifs_tnc_replace(struct ubifs_info *c, const union ubifs_key *key,
|
|||
if (found) {
|
||||
/* Ensure the znode is dirtied */
|
||||
if (znode->cnext || !ubifs_zn_dirty(znode)) {
|
||||
znode = dirty_cow_bottom_up(c,
|
||||
znode);
|
||||
znode = dirty_cow_bottom_up(c, znode);
|
||||
if (IS_ERR(znode)) {
|
||||
err = PTR_ERR(znode);
|
||||
goto out_unlock;
|
||||
|
|
|
@ -481,8 +481,8 @@ struct ubifs_lprops {
|
|||
struct ubifs_lpt_lprops {
|
||||
int free;
|
||||
int dirty;
|
||||
unsigned tgc : 1;
|
||||
unsigned cmt : 1;
|
||||
unsigned tgc:1;
|
||||
unsigned cmt:1;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -1322,8 +1322,8 @@ struct ubifs_info {
|
|||
void *sbuf;
|
||||
struct list_head idx_gc;
|
||||
int idx_gc_cnt;
|
||||
volatile int gc_seq;
|
||||
volatile int gced_lnum;
|
||||
int gc_seq;
|
||||
int gced_lnum;
|
||||
|
||||
struct list_head infos_list;
|
||||
struct mutex umount_mutex;
|
||||
|
|
Загрузка…
Ссылка в новой задаче