Update bcachefs sources to 070ec8d07b bcachefs: Snapshot depth, skiplist fields

[bcachefs-tools-debian] / libbcachefs / fs-io.c

diff --git a/libbcachefs/fs-io.c b/libbcachefs/fs-io.c
index 45858174c1f300be6b72c2ab71f46fd87b980038..a8060052c94f00f4d36e165f4f4131e1694b50af 100644 (file)
--- a/libbcachefs/fs-io.c
+++ b/libbcachefs/fs-io.c
@@ -458,7 +458,7 @@ enum bch_folio_sector_state {
 #undef x
 };
 
-const char * const bch2_folio_sector_states[] = {
+static const char * const bch2_folio_sector_states[] = {
 #define x(n)   #n,
        BCH_FOLIO_SECTOR_STATE()
 #undef x
@@ -997,7 +997,7 @@ vm_fault_t bch2_page_fault(struct vm_fault *vmf)
        struct address_space *mapping = file->f_mapping;
        struct address_space *fdm = faults_disabled_mapping();
        struct bch_inode_info *inode = file_bch_inode(file);
-       int ret;
+       vm_fault_t ret;
 
        if (fdm == mapping)
                return VM_FAULT_SIGBUS;
@@ -1039,7 +1039,7 @@ vm_fault_t bch2_page_mkwrite(struct vm_fault *vmf)
        struct bch2_folio_reservation res;
        unsigned len;
        loff_t isize;
-       int ret;
+       vm_fault_t ret;
 
        bch2_folio_reservation_init(c, inode, &res);
 
@@ -3918,10 +3918,6 @@ void bch2_fs_fsio_exit(struct bch_fs *c)
 
 int bch2_fs_fsio_init(struct bch_fs *c)
 {
-       int ret = 0;
-
-       pr_verbose_init(c->opts, "");
-
        if (bioset_init(&c->writepage_bioset,
                        4, offsetof(struct bch_writepage_io, op.wbio.bio),
                        BIOSET_NEED_BVECS))
@@ -3941,8 +3937,7 @@ int bch2_fs_fsio_init(struct bch_fs *c)
                        1, offsetof(struct nocow_flush, bio), 0))
                return -BCH_ERR_ENOMEM_nocow_flush_bioset_init;
 
-       pr_verbose_init(c->opts, "ret %i", ret);
-       return ret;
+       return 0;
 }
 
 #endif /* NO_BCACHEFS_FS */