alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-02 00:00:03 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Update bcachefs sources to c4ca278a54 bcachefs: Delete bch_writepage

Browse Source
This commit is contained in:
Kent Overstreet 2022-05-09 12:40:49 -04:00
parent 6f5afc0c12
commit 0766bee8fd
6 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
bdf6d7c1350497bc7b0be6027a51d9330645672d
c4ca278a540bd2f99864f198a6ec9b4cb1f1fd44

3
libbcachefs/darray.h
View File

@ -51,10 +51,11 @@ static inline int __darray_make_room(darray_void *d, size_t t_size, size_t more)
#define darray_insert_item(_d, _pos, _item) \
({ \
size_t pos = (_pos); \
int _ret = darray_make_room((_d), 1); \
\
if (!_ret) \
array_insert_item((_d)->data, (_d)->nr, (_pos), (_item));\
array_insert_item((_d)->data, (_d)->nr, pos, (_item)); \
_ret; \
})

14
libbcachefs/fs-io.c
View File

@ -1508,20 +1508,6 @@ int bch2_writepages(struct address_space *mapping, struct writeback_control *wbc
return ret;
}
int bch2_writepage(struct page *page, struct writeback_control *wbc)
{
struct bch_fs *c = page->mapping->host->i_sb->s_fs_info;
struct bch_writepage_state w =
bch_writepage_state_init(c, to_bch_ei(page->mapping->host));
int ret;
ret = __bch2_writepage(page, wbc, &w);
if (w.io)
bch2_writepage_do_io(&w);
return ret;
}
/* buffered writes: */
int bch2_write_begin(struct file *file, struct address_space *mapping,

1
libbcachefs/fs-io.h
View File

@ -15,7 +15,6 @@ int __must_check bch2_write_inode_size(struct bch_fs *,
struct bch_inode_info *,
loff_t, unsigned);
int bch2_writepage(struct page *, struct writeback_control *);
int bch2_readpage(struct file *, struct page *);
int bch2_writepages(struct address_space *, struct writeback_control *);

1
libbcachefs/fs.c
View File

@ -1112,7 +1112,6 @@ static const struct inode_operations bch_special_inode_operations = {
};
static const struct address_space_operations bch_address_space_operations = {
.writepage = bch2_writepage,
.readpage = bch2_readpage,
.writepages = bch2_writepages,
.readahead = bch2_readahead,

14
libbcachefs/opts.h
View File

@ -449,17 +449,9 @@ struct bch_option {
enum opt_flags flags;
u64 min, max;
union {
struct {
};
struct {
const char * const *choices;
};
struct {
int (*parse)(struct bch_fs *, const char *, u64 *);
void (*to_text)(struct printbuf *, struct bch_fs *, struct bch_sb *, u64);
};
};
const char * const *choices;
int (*parse)(struct bch_fs *, const char *, u64 *);
void (*to_text)(struct printbuf *, struct bch_fs *, struct bch_sb *, u64);
const char *hint;
const char *help;