From cef2f30ae2a25df41704b9b06fc13882d737cc27 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 15 Aug 2018 19:41:24 -0400 Subject: Update bcachefs sources to 15f6e66e86 bcachefs: pass around bset_tree less --- libbcachefs/fs.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libbcachefs/fs.h') diff --git a/libbcachefs/fs.h b/libbcachefs/fs.h index e2fc2706..a434c757 100644 --- a/libbcachefs/fs.h +++ b/libbcachefs/fs.h @@ -1,6 +1,7 @@ #ifndef _BCACHEFS_FS_H #define _BCACHEFS_FS_H +#include "inode.h" #include "opts.h" #include "str_hash.h" #include "quota_types.h" @@ -43,6 +44,11 @@ static inline unsigned nlink_bias(umode_t mode) return S_ISDIR(mode) ? 2 : 1; } +static inline u64 bch2_current_time(struct bch_fs *c) +{ + return timespec_to_bch2_time(c, current_kernel_time64()); +} + struct bch_inode_unpacked; #ifndef NO_BCACHEFS_FS @@ -59,10 +65,8 @@ int __must_check bch2_write_inode_trans(struct btree_trans *, struct bch_inode_info *, struct bch_inode_unpacked *, inode_set_fn, void *); -int __must_check __bch2_write_inode(struct bch_fs *, struct bch_inode_info *, - inode_set_fn, void *, unsigned); -int __must_check bch2_write_inode(struct bch_fs *, - struct bch_inode_info *); +int __must_check bch2_write_inode(struct bch_fs *, struct bch_inode_info *, + inode_set_fn, void *, unsigned); void bch2_vfs_exit(void); int bch2_vfs_init(void); -- cgit v1.2.3