mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

bcachefs: vstruct_for_each() now declares loop iter 

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-12-17 02:19:23 -05:00
parent 41b84fb489
commit cea07a7b6a
5 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/bcachefs/journal.h
View File

@ -238,8 +238,6 @@ bch2_journal_add_entry(struct journal *j, struct journal_res *res,
static inline bool journal_entry_empty(struct jset *j) static inline bool journal_entry_empty(struct jset *j)
{ {
struct jset_entry *i;
if (j->seq != j->last_seq) if (j->seq != j->last_seq)
return false; return false;

3
fs/bcachefs/journal_io.c
View File

@ -783,7 +783,6 @@ void bch2_journal_entry_to_text(struct printbuf *out, struct bch_fs *c,
static int jset_validate_entries(struct bch_fs *c, struct jset *jset, static int jset_validate_entries(struct bch_fs *c, struct jset *jset,
enum bkey_invalid_flags flags) enum bkey_invalid_flags flags)
{ {
struct jset_entry *entry;
unsigned version = le32_to_cpu(jset->version); unsigned version = le32_to_cpu(jset->version);
int ret = 0; int ret = 0;
@ -1723,7 +1722,7 @@ static CLOSURE_CALLBACK(do_journal_write)
static int bch2_journal_write_prep(struct journal *j, struct journal_buf *w) static int bch2_journal_write_prep(struct journal *j, struct journal_buf *w)
{ {
struct bch_fs *c = container_of(j, struct bch_fs, journal); struct bch_fs *c = container_of(j, struct bch_fs, journal);
struct jset_entry *start, *end, *i; struct jset_entry *start, *end;
struct jset *jset = w->data; struct jset *jset = w->data;
struct journal_keys_to_wb wb = { NULL }; struct journal_keys_to_wb wb = { NULL };
unsigned sectors, bytes, u64s; unsigned sectors, bytes, u64s;

9
fs/bcachefs/recovery.c
View File

@ -344,14 +344,11 @@ static int journal_replay_entry_early(struct bch_fs *c,
static int journal_replay_early(struct bch_fs *c, static int journal_replay_early(struct bch_fs *c,
struct bch_sb_field_clean *clean) struct bch_sb_field_clean *clean)
{ {
struct jset_entry *entry;
int ret;
if (clean) { if (clean) {
for (entry = clean->start; for (struct jset_entry *entry = clean->start;
entry != vstruct_end(&clean->field); entry != vstruct_end(&clean->field);
entry = vstruct_next(entry)) { entry = vstruct_next(entry)) {
ret = journal_replay_entry_early(c, entry); int ret = journal_replay_entry_early(c, entry);
if (ret) if (ret)
return ret; return ret;
} }
@ -366,7 +363,7 @@ static int journal_replay_early(struct bch_fs *c,
continue; continue;
vstruct_for_each(&i->j, entry) { vstruct_for_each(&i->j, entry) {
ret = journal_replay_entry_early(c, entry); int ret = journal_replay_entry_early(c, entry);
if (ret) if (ret)
return ret; return ret;
} }

4
fs/bcachefs/super-io.c
View File

@ -101,8 +101,6 @@ static int bch2_sb_field_validate(struct bch_sb *, struct bch_sb_field *,
struct bch_sb_field *bch2_sb_field_get_id(struct bch_sb *sb, struct bch_sb_field *bch2_sb_field_get_id(struct bch_sb *sb,
enum bch_sb_field_type type) enum bch_sb_field_type type)
{ {
struct bch_sb_field *f;
/* XXX: need locking around superblock to access optional fields */ /* XXX: need locking around superblock to access optional fields */
vstruct_for_each(sb, f) vstruct_for_each(sb, f)
@ -366,7 +364,6 @@ static int bch2_sb_validate(struct bch_sb_handle *disk_sb, struct printbuf *out,
int rw) int rw)
{ {
struct bch_sb *sb = disk_sb->sb; struct bch_sb *sb = disk_sb->sb;
struct bch_sb_field *f;
struct bch_sb_field_members_v1 *mi; struct bch_sb_field_members_v1 *mi;
enum bch_opt_id opt_id; enum bch_opt_id opt_id;
u16 block_size; u16 block_size;
@ -1250,7 +1247,6 @@ void bch2_sb_layout_to_text(struct printbuf *out, struct bch_sb_layout *l)
void bch2_sb_to_text(struct printbuf *out, struct bch_sb *sb, void bch2_sb_to_text(struct printbuf *out, struct bch_sb *sb,
bool print_layout, unsigned fields) bool print_layout, unsigned fields)
{ {
struct bch_sb_field *f;
u64 fields_have = 0; u64 fields_have = 0;
unsigned nr_devices = 0; unsigned nr_devices = 0;

10
fs/bcachefs/vstructs.h
View File

@ -48,14 +48,14 @@
((void *) ((u64 *) (_s)->_data + __vstruct_u64s(_s))) ((void *) ((u64 *) (_s)->_data + __vstruct_u64s(_s)))
#define vstruct_for_each(_s, _i) \ #define vstruct_for_each(_s, _i) \
for (_i = (_s)->start; \ for (typeof(&(_s)->start[0]) _i = (_s)->start; \
_i < vstruct_last(_s); \ _i < vstruct_last(_s); \
_i = vstruct_next(_i)) _i = vstruct_next(_i))
#define vstruct_for_each_safe(_s, _i, _t) \ #define vstruct_for_each_safe(_s, _i) \
for (_i = (_s)->start; \ for (typeof(&(_s)->start[0]) _next, _i = (_s)->start; \
_i < vstruct_last(_s) && (_t = vstruct_next(_i), true); \ _i < vstruct_last(_s) && (_next = vstruct_next(_i), true); \
_i = _t) _i = _next)
#define vstruct_idx(_s, _idx) \ #define vstruct_idx(_s, _idx) \
((typeof(&(_s)->start[0])) ((_s)->_data + (_idx))) ((typeof(&(_s)->start[0])) ((_s)->_data + (_idx)))