Update bcachefs sources to c4ca278a54 bcachefs: Delete bch_writepage

diff --git a/.bcachefs_revision b/.bcachefs_revision
index 4fb144ee88879c2acdb04f62cd2980538d1d5204..9aed74e1dad1daaa9b3f616b615fd6d83d67cdcc 100644 (file)
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-bdf6d7c1350497bc7b0be6027a51d9330645672d
+c4ca278a540bd2f99864f198a6ec9b4cb1f1fd44

diff --git a/libbcachefs/darray.h b/libbcachefs/darray.h
index 049e1d1e13427dd2811f842bbd9a3a376fd8de25..519ab9b96e67fd6e2257b3a63e3becde7711cbca 100644 (file)
--- a/libbcachefs/darray.h
+++ b/libbcachefs/darray.h
@@ -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;                                                           \
 })
 

diff --git a/libbcachefs/fs-io.c b/libbcachefs/fs-io.c
index 4cb2b2eb4dbe541da8d53bbf8c190241e7d0c978..020e603c3faa0a1a769f8e636721da3320b4a7b7 100644 (file)
--- a/libbcachefs/fs-io.c
+++ b/libbcachefs/fs-io.c
@@ -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,

diff --git a/libbcachefs/fs-io.h b/libbcachefs/fs-io.h
index b24efeaf343e75279507009c6f9147916ad5c5c6..e073dc837ae98903c700fad8ea8c7a8b47e4abea 100644 (file)
--- a/libbcachefs/fs-io.h
+++ b/libbcachefs/fs-io.h
@@ -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 *);

diff --git a/libbcachefs/fs.c b/libbcachefs/fs.c
index d462c06899d677e3c7a67ea73b865b2292f94cda..c5801a3f636f7af4353b7f6d4c69ba0921042262 100644 (file)
--- a/libbcachefs/fs.c
+++ b/libbcachefs/fs.c
@@ -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,

diff --git a/libbcachefs/opts.h b/libbcachefs/opts.h
index 85f029602eb5f41c61660b73b3f34f1643533fba..6a1cd41e63749b817df4202b55954b1786909925 100644 (file)
--- a/libbcachefs/opts.h
+++ b/libbcachefs/opts.h
@@ -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;