iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: delete duplicated code

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2019-04-05 00:20:02 -04:00 committed by Kent Overstreet
parent 330581f16f
commit 478259b749
3 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/bcachefs/journal.c
View File

@ -55,19 +55,6 @@ static void bch2_journal_buf_init(struct journal *j)
buf->data->u64s = 0; buf->data->u64s = 0;
} }
static inline bool journal_entry_empty(struct jset *j)
{
struct jset_entry *i;
if (j->seq != j->last_seq)
return false;
vstruct_for_each(j, i)
if (i->type || i->u64s)
return false;
return true;
}
void bch2_journal_halt(struct journal *j) void bch2_journal_halt(struct journal *j)
{ {
union journal_res_state old, new; union journal_res_state old, new;

13
fs/bcachefs/journal.h
View File

@ -231,6 +231,19 @@ static inline void bch2_journal_add_keys(struct journal *j, struct journal_res *
id, 0, k, k->k.u64s); id, 0, k, k->k.u64s);
} }
static inline bool journal_entry_empty(struct jset *j)
{
struct jset_entry *i;
if (j->seq != j->last_seq)
return false;
vstruct_for_each(j, i)
if (i->type == BCH_JSET_ENTRY_btree_keys && i->u64s)
return false;
return true;
}
void __bch2_journal_buf_put(struct journal *, bool); void __bch2_journal_buf_put(struct journal *, bool);
static inline void bch2_journal_buf_put(struct journal *j, unsigned idx, static inline void bch2_journal_buf_put(struct journal *j, unsigned idx,

29
fs/bcachefs/recovery.c
View File

@ -322,32 +322,9 @@ fsck_err:
static bool journal_empty(struct list_head *journal) static bool journal_empty(struct list_head *journal)
{ {
struct journal_replay *i; return list_empty(journal) ||
struct jset_entry *entry; journal_entry_empty(&list_last_entry(journal,
struct journal_replay, list)->j);
if (list_empty(journal))
return true;
i = list_last_entry(journal, struct journal_replay, list);
if (i->j.last_seq != i->j.seq)
return false;
list_for_each_entry(i, journal, list) {
vstruct_for_each(&i->j, entry) {
if (entry->type == BCH_JSET_ENTRY_btree_root ||
entry->type == BCH_JSET_ENTRY_usage ||
entry->type == BCH_JSET_ENTRY_data_usage)
continue;
if (entry->type == BCH_JSET_ENTRY_btree_keys &&
!entry->u64s)
continue;
return false;
}
}
return true;
} }
int bch2_fs_recovery(struct bch_fs *c) int bch2_fs_recovery(struct bch_fs *c)