]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/fs.c
Update bcachefs sources to 0a9f0fc68a bcachefs: Don't unconditially version_upgrade...
[bcachefs-tools-debian] / libbcachefs / fs.c
index 6c9792e8a9912bbe9563f989c5f4b6ce0c12c878..1cca02f0aa3de2cf3ddb0e714e79e4b685cda278 100644 (file)
@@ -1,25 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0
+#ifndef NO_BCACHEFS_FS
 
 #include "bcachefs.h"
 #include "acl.h"
+#include "bkey_buf.h"
 #include "btree_update.h"
 #include "buckets.h"
 #include "chardev.h"
 #include "dirent.h"
 #include "extents.h"
 #include "fs.h"
+#include "fs-common.h"
 #include "fs-io.h"
+#include "fs-ioctl.h"
 #include "fsck.h"
 #include "inode.h"
+#include "io.h"
 #include "journal.h"
 #include "keylist.h"
+#include "quota.h"
 #include "super.h"
 #include "xattr.h"
 
 #include <linux/aio.h>
 #include <linux/backing-dev.h>
-#include <linux/compat.h>
+#include <linux/exportfs.h>
+#include <linux/fiemap.h>
 #include <linux/module.h>
-#include <linux/mount.h>
+#include <linux/posix_acl.h>
 #include <linux/random.h>
 #include <linux/statfs.h>
 #include <linux/xattr.h>
@@ -30,669 +38,826 @@ static void bch2_vfs_inode_init(struct bch_fs *,
                                struct bch_inode_info *,
                                struct bch_inode_unpacked *);
 
-/*
- * I_SIZE_DIRTY requires special handling:
- *
- * To the recovery code, the flag means that there is stale data past i_size
- * that needs to be deleted; it's used for implementing atomic appends and
- * truncates.
- *
- * On append, we set I_SIZE_DIRTY before doing the write, then after the write
- * we clear I_SIZE_DIRTY atomically with updating i_size to the new larger size
- * that exposes the data we just wrote.
- *
- * On truncate, it's the reverse: We set I_SIZE_DIRTY atomically with setting
- * i_size to the new smaller size, then we delete the data that we just made
- * invisible, and then we clear I_SIZE_DIRTY.
- *
- * Because there can be multiple appends in flight at a time, we need a refcount
- * (i_size_dirty_count) instead of manipulating the flag directly. Nonzero
- * refcount means I_SIZE_DIRTY is set, zero means it's cleared.
- *
- * Because write_inode() can be called at any time, i_size_dirty_count means
- * something different to the runtime code - it means to write_inode() "don't
- * update i_size yet".
- *
- * We don't clear I_SIZE_DIRTY directly, we let write_inode() clear it when
- * i_size_dirty_count is zero - but the reverse is not true, I_SIZE_DIRTY must
- * be set explicitly.
- */
-
-int __must_check __bch2_write_inode(struct bch_fs *c,
-                                   struct bch_inode_info *ei,
-                                   inode_set_fn set,
-                                   void *p)
+static void journal_seq_copy(struct bch_fs *c,
+                            struct bch_inode_info *dst,
+                            u64 journal_seq)
 {
-       struct btree_iter iter;
-       struct inode *inode = &ei->vfs_inode;
-       struct bch_inode_unpacked inode_u;
-       struct bkey_inode_buf inode_p;
-       u64 inum = inode->i_ino;
-       unsigned i_nlink = READ_ONCE(inode->i_nlink);
-       int ret;
-
        /*
-        * We can't write an inode with i_nlink == 0 because it's stored biased;
-        * however, we don't need to because if i_nlink is 0 the inode is
-        * getting deleted when it's evicted.
+        * atomic64_cmpxchg has a fallback for archs that don't support it,
+        * cmpxchg does not:
         */
-       if (!i_nlink)
-               return 0;
+       atomic64_t *dst_seq = (void *) &dst->ei_journal_seq;
+       u64 old, v = READ_ONCE(dst->ei_journal_seq);
 
-       lockdep_assert_held(&ei->update_lock);
+       do {
+               old = v;
 
-       bch2_btree_iter_init(&iter, c, BTREE_ID_INODES, POS(inum, 0),
-                            BTREE_ITER_INTENT);
+               if (old >= journal_seq)
+                       break;
+       } while ((v = atomic64_cmpxchg(dst_seq, old, journal_seq)) != old);
 
-       do {
-               struct bkey_s_c k = bch2_btree_iter_peek_with_holes(&iter);
+       bch2_journal_set_has_inum(&c->journal, dst->v.i_ino, journal_seq);
+}
 
-               if ((ret = btree_iter_err(k)))
-                       goto out;
+static void __pagecache_lock_put(struct pagecache_lock *lock, long i)
+{
+       BUG_ON(atomic_long_read(&lock->v) == 0);
 
-               if (WARN_ONCE(k.k->type != BCH_INODE_FS,
-                             "inode %llu not found when updating", inum)) {
-                       bch2_btree_iter_unlock(&iter);
-                       return -ENOENT;
-               }
+       if (atomic_long_sub_return_release(i, &lock->v) == 0)
+               wake_up_all(&lock->wait);
+}
 
-               ret = bch2_inode_unpack(bkey_s_c_to_inode(k), &inode_u);
-               if (WARN_ONCE(ret,
-                             "error %i unpacking inode %llu", ret, inum)) {
-                       ret = -ENOENT;
-                       break;
-               }
+static bool __pagecache_lock_tryget(struct pagecache_lock *lock, long i)
+{
+       long v = atomic_long_read(&lock->v), old;
 
-               if (set) {
-                       ret = set(ei, &inode_u, p);
-                       if (ret)
-                               goto out;
-               }
+       do {
+               old = v;
 
-               BUG_ON(i_nlink < nlink_bias(inode->i_mode));
+               if (i > 0 ? v < 0 : v > 0)
+                       return false;
+       } while ((v = atomic_long_cmpxchg_acquire(&lock->v,
+                                       old, old + i)) != old);
+       return true;
+}
 
-               inode_u.i_mode  = inode->i_mode;
-               inode_u.i_uid   = i_uid_read(inode);
-               inode_u.i_gid   = i_gid_read(inode);
-               inode_u.i_nlink = i_nlink - nlink_bias(inode->i_mode);
-               inode_u.i_dev   = inode->i_rdev;
-               inode_u.i_atime = timespec_to_bch2_time(c, inode->i_atime);
-               inode_u.i_mtime = timespec_to_bch2_time(c, inode->i_mtime);
-               inode_u.i_ctime = timespec_to_bch2_time(c, inode->i_ctime);
+static void __pagecache_lock_get(struct pagecache_lock *lock, long i)
+{
+       wait_event(lock->wait, __pagecache_lock_tryget(lock, i));
+}
 
-               bch2_inode_pack(&inode_p, &inode_u);
+void bch2_pagecache_add_put(struct pagecache_lock *lock)
+{
+       __pagecache_lock_put(lock, 1);
+}
 
-               ret = bch2_btree_insert_at(c, NULL, NULL, &ei->journal_seq,
-                               BTREE_INSERT_ATOMIC|
-                               BTREE_INSERT_NOFAIL,
-                               BTREE_INSERT_ENTRY(&iter, &inode_p.inode.k_i));
-       } while (ret == -EINTR);
+bool bch2_pagecache_add_tryget(struct pagecache_lock *lock)
+{
+       return __pagecache_lock_tryget(lock, 1);
+}
 
-       if (!ret) {
-               ei->i_size      = inode_u.i_size;
-               ei->i_flags     = inode_u.i_flags;
-       }
-out:
-       bch2_btree_iter_unlock(&iter);
+void bch2_pagecache_add_get(struct pagecache_lock *lock)
+{
+       __pagecache_lock_get(lock, 1);
+}
 
-       return ret < 0 ? ret : 0;
+void bch2_pagecache_block_put(struct pagecache_lock *lock)
+{
+       __pagecache_lock_put(lock, -1);
 }
 
-int __must_check bch2_write_inode(struct bch_fs *c,
-                                 struct bch_inode_info *ei)
+void bch2_pagecache_block_get(struct pagecache_lock *lock)
 {
-       return __bch2_write_inode(c, ei, NULL, NULL);
+       __pagecache_lock_get(lock, -1);
 }
 
-int bch2_inc_nlink(struct bch_fs *c, struct bch_inode_info *ei)
+void bch2_inode_update_after_write(struct bch_fs *c,
+                                  struct bch_inode_info *inode,
+                                  struct bch_inode_unpacked *bi,
+                                  unsigned fields)
 {
+       set_nlink(&inode->v, bch2_inode_nlink_get(bi));
+       i_uid_write(&inode->v, bi->bi_uid);
+       i_gid_write(&inode->v, bi->bi_gid);
+       inode->v.i_mode = bi->bi_mode;
+
+       if (fields & ATTR_ATIME)
+               inode->v.i_atime = bch2_time_to_timespec(c, bi->bi_atime);
+       if (fields & ATTR_MTIME)
+               inode->v.i_mtime = bch2_time_to_timespec(c, bi->bi_mtime);
+       if (fields & ATTR_CTIME)
+               inode->v.i_ctime = bch2_time_to_timespec(c, bi->bi_ctime);
+
+       inode->ei_inode         = *bi;
+
+       bch2_inode_flags_to_vfs(inode);
+}
+
+int __must_check bch2_write_inode(struct bch_fs *c,
+                                 struct bch_inode_info *inode,
+                                 inode_set_fn set,
+                                 void *p, unsigned fields)
+{
+       struct btree_trans trans;
+       struct btree_iter *iter;
+       struct bch_inode_unpacked inode_u;
        int ret;
 
-       mutex_lock(&ei->update_lock);
-       inc_nlink(&ei->vfs_inode);
-       ret = bch2_write_inode(c, ei);
-       mutex_unlock(&ei->update_lock);
+       bch2_trans_init(&trans, c, 0, 0);
+retry:
+       bch2_trans_begin(&trans);
 
-       return ret;
+       iter = bch2_inode_peek(&trans, &inode_u, inode->v.i_ino,
+                              BTREE_ITER_INTENT);
+       ret   = PTR_ERR_OR_ZERO(iter) ?:
+               (set ? set(inode, &inode_u, p) : 0) ?:
+               bch2_inode_write(&trans, iter, &inode_u) ?:
+               bch2_trans_commit(&trans, NULL,
+                                 &inode->ei_journal_seq,
+                                 BTREE_INSERT_NOUNLOCK|
+                                 BTREE_INSERT_NOFAIL);
+
+       /*
+        * the btree node lock protects inode->ei_inode, not ei_update_lock;
+        * this is important for inode updates via bchfs_write_index_update
+        */
+       if (!ret)
+               bch2_inode_update_after_write(c, inode, &inode_u, fields);
+
+       bch2_trans_iter_put(&trans, iter);
+
+       if (ret == -EINTR)
+               goto retry;
+
+       bch2_trans_exit(&trans);
+       return ret < 0 ? ret : 0;
 }
 
-int bch2_dec_nlink(struct bch_fs *c, struct bch_inode_info *ei)
+int bch2_fs_quota_transfer(struct bch_fs *c,
+                          struct bch_inode_info *inode,
+                          struct bch_qid new_qid,
+                          unsigned qtypes,
+                          enum quota_acct_mode mode)
 {
-       int ret = 0;
+       unsigned i;
+       int ret;
+
+       qtypes &= enabled_qtypes(c);
 
-       mutex_lock(&ei->update_lock);
-       drop_nlink(&ei->vfs_inode);
-       ret = bch2_write_inode(c, ei);
-       mutex_unlock(&ei->update_lock);
+       for (i = 0; i < QTYP_NR; i++)
+               if (new_qid.q[i] == inode->ei_qid.q[i])
+                       qtypes &= ~(1U << i);
+
+       if (!qtypes)
+               return 0;
+
+       mutex_lock(&inode->ei_quota_lock);
+
+       ret = bch2_quota_transfer(c, qtypes, new_qid,
+                                 inode->ei_qid,
+                                 inode->v.i_blocks +
+                                 inode->ei_quota_reserved,
+                                 mode);
+       if (!ret)
+               for (i = 0; i < QTYP_NR; i++)
+                       if (qtypes & (1 << i))
+                               inode->ei_qid.q[i] = new_qid.q[i];
+
+       mutex_unlock(&inode->ei_quota_lock);
 
        return ret;
 }
 
-static struct inode *bch2_vfs_inode_get(struct super_block *sb, u64 inum)
+struct inode *bch2_vfs_inode_get(struct bch_fs *c, u64 inum)
 {
-       struct bch_fs *c = sb->s_fs_info;
-       struct inode *inode;
        struct bch_inode_unpacked inode_u;
-       struct bch_inode_info *ei;
+       struct bch_inode_info *inode;
        int ret;
 
-       pr_debug("inum %llu", inum);
-
-       inode = iget_locked(sb, inum);
+       inode = to_bch_ei(iget_locked(c->vfs_sb, inum));
        if (unlikely(!inode))
                return ERR_PTR(-ENOMEM);
-       if (!(inode->i_state & I_NEW))
-               return inode;
+       if (!(inode->v.i_state & I_NEW))
+               return &inode->v;
 
        ret = bch2_inode_find_by_inum(c, inum, &inode_u);
        if (ret) {
-               iget_failed(inode);
+               iget_failed(&inode->v);
                return ERR_PTR(ret);
        }
 
-       ei = to_bch_ei(inode);
-       bch2_vfs_inode_init(c, ei, &inode_u);
+       bch2_vfs_inode_init(c, inode, &inode_u);
 
-       ei->journal_seq = bch2_inode_journal_seq(&c->journal, inum);
+       inode->ei_journal_seq = bch2_inode_journal_seq(&c->journal, inum);
 
-       unlock_new_inode(inode);
+       unlock_new_inode(&inode->v);
 
-       return inode;
+       return &inode->v;
 }
 
-static struct inode *bch2_vfs_inode_create(struct bch_fs *c,
-                                          struct inode *parent,
-                                          umode_t mode, dev_t rdev)
+static int inum_test(struct inode *inode, void *p)
 {
-       struct inode *inode;
-       struct posix_acl *default_acl = NULL, *acl = NULL;
-       struct bch_inode_info *ei;
-       struct bch_inode_unpacked inode_u;
-       struct bkey_inode_buf inode_p;
-       int ret;
+       unsigned long *ino = p;
 
-       inode = new_inode(parent->i_sb);
-       if (unlikely(!inode))
-               return ERR_PTR(-ENOMEM);
+       return *ino == inode->i_ino;
+}
 
-       inode_init_owner(inode, parent, mode);
+static struct bch_inode_info *
+__bch2_create(struct bch_inode_info *dir, struct dentry *dentry,
+             umode_t mode, dev_t rdev, bool tmpfile)
+{
+       struct bch_fs *c = dir->v.i_sb->s_fs_info;
+       struct user_namespace *ns = dir->v.i_sb->s_user_ns;
+       struct btree_trans trans;
+       struct bch_inode_unpacked dir_u;
+       struct bch_inode_info *inode, *old;
+       struct bch_inode_unpacked inode_u;
+       struct posix_acl *default_acl = NULL, *acl = NULL;
+       u64 journal_seq = 0;
+       int ret;
 
-       ret = posix_acl_create(parent, &inode->i_mode, &default_acl, &acl);
-       if (ret) {
-               make_bad_inode(inode);
+       /*
+        * preallocate acls + vfs inode before btree transaction, so that
+        * nothing can fail after the transaction succeeds:
+        */
+#ifdef CONFIG_BCACHEFS_POSIX_ACL
+       ret = posix_acl_create(&dir->v, &mode, &default_acl, &acl);
+       if (ret)
+               return ERR_PTR(ret);
+#endif
+       inode = to_bch_ei(new_inode(c->vfs_sb));
+       if (unlikely(!inode)) {
+               inode = ERR_PTR(-ENOMEM);
                goto err;
        }
 
-       ei = to_bch_ei(inode);
+       bch2_inode_init_early(c, &inode_u);
 
-       bch2_inode_init(c, &inode_u, i_uid_read(inode),
-                      i_gid_read(inode), inode->i_mode, rdev);
-       bch2_inode_pack(&inode_p, &inode_u);
+       if (!tmpfile)
+               mutex_lock(&dir->ei_update_lock);
 
-       ret = bch2_inode_create(c, &inode_p.inode.k_i,
-                              BLOCKDEV_INODE_MAX, 0,
-                              &c->unused_inode_hint);
-       if (unlikely(ret)) {
-               /*
-                * indicate to bch_evict_inode that the inode was never actually
-                * created:
-                */
-               make_bad_inode(inode);
-               goto err;
-       }
+       bch2_trans_init(&trans, c, 8,
+                       2048 + (!tmpfile ? dentry->d_name.len : 0));
+retry:
+       bch2_trans_begin(&trans);
 
-       inode_u.inum = inode_p.inode.k.p.inode;
-       bch2_vfs_inode_init(c, ei, &inode_u);
+       ret   = bch2_create_trans(&trans, dir->v.i_ino, &dir_u, &inode_u,
+                                 !tmpfile ? &dentry->d_name : NULL,
+                                 from_kuid(ns, current_fsuid()),
+                                 from_kgid(ns, current_fsgid()),
+                                 mode, rdev,
+                                 default_acl, acl) ?:
+               bch2_quota_acct(c, bch_qid(&inode_u), Q_INO, 1,
+                               KEY_TYPE_QUOTA_PREALLOC);
+       if (unlikely(ret))
+               goto err_before_quota;
 
-       if (default_acl) {
-               ret = bch2_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
-               if (unlikely(ret))
-                       goto err;
+       ret   = bch2_trans_commit(&trans, NULL, &journal_seq,
+                                 BTREE_INSERT_NOUNLOCK);
+       if (unlikely(ret)) {
+               bch2_quota_acct(c, bch_qid(&inode_u), Q_INO, -1,
+                               KEY_TYPE_QUOTA_WARN);
+err_before_quota:
+               if (ret == -EINTR)
+                       goto retry;
+               goto err_trans;
        }
 
-       if (acl) {
-               ret = bch2_set_acl(inode, acl, ACL_TYPE_ACCESS);
-               if (unlikely(ret))
-                       goto err;
+       if (!tmpfile) {
+               bch2_inode_update_after_write(c, dir, &dir_u,
+                                             ATTR_MTIME|ATTR_CTIME);
+               journal_seq_copy(c, dir, journal_seq);
+               mutex_unlock(&dir->ei_update_lock);
        }
 
-       insert_inode_hash(inode);
-       atomic_long_inc(&c->nr_inodes);
-out:
-       posix_acl_release(default_acl);
-       posix_acl_release(acl);
-       return inode;
-err:
-       clear_nlink(inode);
-       iput(inode);
-       inode = ERR_PTR(ret);
-       goto out;
-}
-
-static int bch2_vfs_dirent_create(struct bch_fs *c, struct inode *dir,
-                                 u8 type, const struct qstr *name,
-                                 struct inode *dst)
-{
-       struct bch_inode_info *dir_ei = to_bch_ei(dir);
-       int ret;
+       bch2_vfs_inode_init(c, inode, &inode_u);
+       journal_seq_copy(c, inode, journal_seq);
 
-       ret = bch2_dirent_create(c, dir->i_ino, &dir_ei->str_hash,
-                               type, name, dst->i_ino,
-                               &dir_ei->journal_seq,
-                               BCH_HASH_SET_MUST_CREATE);
-       if (unlikely(ret))
-               return ret;
-
-       dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb);
-       mark_inode_dirty_sync(dir);
-       return 0;
-}
+       set_cached_acl(&inode->v, ACL_TYPE_ACCESS, acl);
+       set_cached_acl(&inode->v, ACL_TYPE_DEFAULT, default_acl);
 
-static int __bch2_create(struct inode *dir, struct dentry *dentry,
-                        umode_t mode, dev_t rdev)
-{
-       struct bch_inode_info *dir_ei = to_bch_ei(dir);
-       struct bch_fs *c = dir->i_sb->s_fs_info;
-       struct inode *inode;
-       struct bch_inode_info *ei;
-       int ret;
+       /*
+        * we must insert the new inode into the inode cache before calling
+        * bch2_trans_exit() and dropping locks, else we could race with another
+        * thread pulling the inode in and modifying it:
+        */
 
-       inode = bch2_vfs_inode_create(c, dir, mode, rdev);
-       if (unlikely(IS_ERR(inode)))
-               return PTR_ERR(inode);
+       inode->v.i_state |= I_CREATING;
+       old = to_bch_ei(inode_insert5(&inode->v, inode->v.i_ino,
+                                     inum_test, NULL, &inode->v.i_ino));
+       BUG_ON(!old);
 
-       ei = to_bch_ei(inode);
+       if (unlikely(old != inode)) {
+               /*
+                * We raced, another process pulled the new inode into cache
+                * before us:
+                */
+               journal_seq_copy(c, old, journal_seq);
+               make_bad_inode(&inode->v);
+               iput(&inode->v);
 
-       ret = bch2_vfs_dirent_create(c, dir, mode_to_type(mode),
-                                   &dentry->d_name, inode);
-       if (unlikely(ret)) {
-               clear_nlink(inode);
-               iput(inode);
-               return ret;
+               inode = old;
+       } else {
+               /*
+                * we really don't want insert_inode_locked2() to be setting
+                * I_NEW...
+                */
+               unlock_new_inode(&inode->v);
        }
 
-       if (dir_ei->journal_seq > ei->journal_seq)
-               ei->journal_seq = dir_ei->journal_seq;
+       bch2_trans_exit(&trans);
+err:
+       posix_acl_release(default_acl);
+       posix_acl_release(acl);
+       return inode;
+err_trans:
+       if (!tmpfile)
+               mutex_unlock(&dir->ei_update_lock);
 
-       d_instantiate(dentry, inode);
-       return 0;
+       bch2_trans_exit(&trans);
+       make_bad_inode(&inode->v);
+       iput(&inode->v);
+       inode = ERR_PTR(ret);
+       goto err;
 }
 
 /* methods */
 
-static struct dentry *bch2_lookup(struct inode *dir, struct dentry *dentry,
+static struct dentry *bch2_lookup(struct inode *vdir, struct dentry *dentry,
                                  unsigned int flags)
 {
-       struct bch_fs *c = dir->i_sb->s_fs_info;
-       struct bch_inode_info *dir_ei = to_bch_ei(dir);
-       struct inode *inode = NULL;
+       struct bch_fs *c = vdir->i_sb->s_fs_info;
+       struct bch_inode_info *dir = to_bch_ei(vdir);
+       struct bch_hash_info hash = bch2_hash_info_init(c, &dir->ei_inode);
+       struct inode *vinode = NULL;
        u64 inum;
 
-       inum = bch2_dirent_lookup(c, dir->i_ino,
-                                &dir_ei->str_hash,
-                                &dentry->d_name);
+       inum = bch2_dirent_lookup(c, dir->v.i_ino, &hash,
+                                 &dentry->d_name);
 
        if (inum)
-               inode = bch2_vfs_inode_get(dir->i_sb, inum);
+               vinode = bch2_vfs_inode_get(c, inum);
 
-       return d_splice_alias(inode, dentry);
+       return d_splice_alias(vinode, dentry);
 }
 
-static int bch2_create(struct inode *dir, struct dentry *dentry,
+static int bch2_mknod(struct inode *vdir, struct dentry *dentry,
+                     umode_t mode, dev_t rdev)
+{
+       struct bch_inode_info *inode =
+               __bch2_create(to_bch_ei(vdir), dentry, mode, rdev, false);
+
+       if (IS_ERR(inode))
+               return PTR_ERR(inode);
+
+       d_instantiate(dentry, &inode->v);
+       return 0;
+}
+
+static int bch2_create(struct inode *vdir, struct dentry *dentry,
                       umode_t mode, bool excl)
 {
-       return __bch2_create(dir, dentry, mode|S_IFREG, 0);
+       return bch2_mknod(vdir, dentry, mode|S_IFREG, 0);
 }
 
-static int bch2_link(struct dentry *old_dentry, struct inode *dir,
-                    struct dentry *dentry)
+static int __bch2_link(struct bch_fs *c,
+                      struct bch_inode_info *inode,
+                      struct bch_inode_info *dir,
+                      struct dentry *dentry)
 {
-       struct bch_fs *c = dir->i_sb->s_fs_info;
-       struct inode *inode = old_dentry->d_inode;
-       struct bch_inode_info *ei = to_bch_ei(inode);
+       struct btree_trans trans;
+       struct bch_inode_unpacked dir_u, inode_u;
        int ret;
 
-       lockdep_assert_held(&inode->i_rwsem);
+       mutex_lock(&inode->ei_update_lock);
+       bch2_trans_init(&trans, c, 4, 1024);
 
-       inode->i_ctime = current_fs_time(dir->i_sb);
+       ret = __bch2_trans_do(&trans, NULL, &inode->ei_journal_seq,
+                             BTREE_INSERT_NOUNLOCK,
+                       bch2_link_trans(&trans,
+                                       dir->v.i_ino,
+                                       inode->v.i_ino, &dir_u, &inode_u,
+                                       &dentry->d_name));
 
-       ret = bch2_inc_nlink(c, ei);
-       if (ret)
-               return ret;
-
-       ihold(inode);
+       if (likely(!ret)) {
+               BUG_ON(inode_u.bi_inum != inode->v.i_ino);
 
-       ret = bch2_vfs_dirent_create(c, dir, mode_to_type(inode->i_mode),
-                                   &dentry->d_name, inode);
-       if (unlikely(ret)) {
-               bch2_dec_nlink(c, ei);
-               iput(inode);
-               return ret;
+               journal_seq_copy(c, inode, dir->ei_journal_seq);
+               bch2_inode_update_after_write(c, dir, &dir_u,
+                                             ATTR_MTIME|ATTR_CTIME);
+               bch2_inode_update_after_write(c, inode, &inode_u, ATTR_CTIME);
        }
 
-       d_instantiate(dentry, inode);
-       return 0;
+       bch2_trans_exit(&trans);
+       mutex_unlock(&inode->ei_update_lock);
+       return ret;
 }
 
-static int bch2_unlink(struct inode *dir, struct dentry *dentry)
+static int bch2_link(struct dentry *old_dentry, struct inode *vdir,
+                    struct dentry *dentry)
 {
-       struct bch_fs *c = dir->i_sb->s_fs_info;
-       struct bch_inode_info *dir_ei = to_bch_ei(dir);
-       struct inode *inode = dentry->d_inode;
-       struct bch_inode_info *ei = to_bch_ei(inode);
+       struct bch_fs *c = vdir->i_sb->s_fs_info;
+       struct bch_inode_info *dir = to_bch_ei(vdir);
+       struct bch_inode_info *inode = to_bch_ei(old_dentry->d_inode);
        int ret;
 
-       lockdep_assert_held(&inode->i_rwsem);
+       lockdep_assert_held(&inode->v.i_rwsem);
 
-       ret = bch2_dirent_delete(c, dir->i_ino, &dir_ei->str_hash,
-                               &dentry->d_name, &dir_ei->journal_seq);
-       if (ret)
+       ret = __bch2_link(c, inode, dir, dentry);
+       if (unlikely(ret))
                return ret;
 
-       if (dir_ei->journal_seq > ei->journal_seq)
-               ei->journal_seq = dir_ei->journal_seq;
+       ihold(&inode->v);
+       d_instantiate(dentry, &inode->v);
+       return 0;
+}
 
-       inode->i_ctime = dir->i_ctime;
+static int bch2_unlink(struct inode *vdir, struct dentry *dentry)
+{
+       struct bch_fs *c = vdir->i_sb->s_fs_info;
+       struct bch_inode_info *dir = to_bch_ei(vdir);
+       struct bch_inode_info *inode = to_bch_ei(dentry->d_inode);
+       struct bch_inode_unpacked dir_u, inode_u;
+       struct btree_trans trans;
+       int ret;
+
+       bch2_lock_inodes(INODE_UPDATE_LOCK, dir, inode);
+       bch2_trans_init(&trans, c, 4, 1024);
+
+       ret = __bch2_trans_do(&trans, NULL, &dir->ei_journal_seq,
+                             BTREE_INSERT_NOUNLOCK|
+                             BTREE_INSERT_NOFAIL,
+                       bch2_unlink_trans(&trans,
+                                         dir->v.i_ino, &dir_u,
+                                         &inode_u, &dentry->d_name));
 
-       if (S_ISDIR(inode->i_mode)) {
-               bch2_dec_nlink(c, dir_ei);
-               drop_nlink(inode);
+       if (likely(!ret)) {
+               BUG_ON(inode_u.bi_inum != inode->v.i_ino);
+
+               journal_seq_copy(c, inode, dir->ei_journal_seq);
+               bch2_inode_update_after_write(c, dir, &dir_u,
+                                             ATTR_MTIME|ATTR_CTIME);
+               bch2_inode_update_after_write(c, inode, &inode_u,
+                                             ATTR_MTIME);
        }
 
-       bch2_dec_nlink(c, ei);
+       bch2_trans_exit(&trans);
+       bch2_unlock_inodes(INODE_UPDATE_LOCK, dir, inode);
 
-       return 0;
+       return ret;
 }
 
-static int bch2_symlink(struct inode *dir, struct dentry *dentry,
+static int bch2_symlink(struct inode *vdir, struct dentry *dentry,
                        const char *symname)
 {
-       struct bch_fs *c = dir->i_sb->s_fs_info;
-       struct inode *inode;
-       struct bch_inode_info *ei, *dir_ei = to_bch_ei(dir);
+       struct bch_fs *c = vdir->i_sb->s_fs_info;
+       struct bch_inode_info *dir = to_bch_ei(vdir), *inode;
        int ret;
 
-       inode = bch2_vfs_inode_create(c, dir, S_IFLNK|S_IRWXUGO, 0);
+       inode = __bch2_create(dir, dentry, S_IFLNK|S_IRWXUGO, 0, true);
        if (unlikely(IS_ERR(inode)))
                return PTR_ERR(inode);
 
-       ei = to_bch_ei(inode);
-
-       inode_lock(inode);
-       ret = page_symlink(inode, symname, strlen(symname) + 1);
-       inode_unlock(inode);
+       inode_lock(&inode->v);
+       ret = page_symlink(&inode->v, symname, strlen(symname) + 1);
+       inode_unlock(&inode->v);
 
        if (unlikely(ret))
                goto err;
 
-       ret = filemap_write_and_wait_range(inode->i_mapping, 0, LLONG_MAX);
+       ret = filemap_write_and_wait_range(inode->v.i_mapping, 0, LLONG_MAX);
        if (unlikely(ret))
                goto err;
 
-       /* XXX: racy */
-       if (dir_ei->journal_seq < ei->journal_seq)
-               dir_ei->journal_seq = ei->journal_seq;
+       journal_seq_copy(c, dir, inode->ei_journal_seq);
 
-       ret = bch2_vfs_dirent_create(c, dir, DT_LNK, &dentry->d_name, inode);
+       ret = __bch2_link(c, inode, dir, dentry);
        if (unlikely(ret))
                goto err;
 
-       d_instantiate(dentry, inode);
+       d_instantiate(dentry, &inode->v);
        return 0;
 err:
-       clear_nlink(inode);
-       iput(inode);
+       iput(&inode->v);
        return ret;
 }
 
-static int bch2_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+static int bch2_mkdir(struct inode *vdir, struct dentry *dentry, umode_t mode)
+{
+       return bch2_mknod(vdir, dentry, mode|S_IFDIR, 0);
+}
+
+static int bch2_rename2(struct inode *src_vdir, struct dentry *src_dentry,
+                       struct inode *dst_vdir, struct dentry *dst_dentry,
+                       unsigned flags)
 {
-       struct bch_fs *c = dir->i_sb->s_fs_info;
+       struct bch_fs *c = src_vdir->i_sb->s_fs_info;
+       struct bch_inode_info *src_dir = to_bch_ei(src_vdir);
+       struct bch_inode_info *dst_dir = to_bch_ei(dst_vdir);
+       struct bch_inode_info *src_inode = to_bch_ei(src_dentry->d_inode);
+       struct bch_inode_info *dst_inode = to_bch_ei(dst_dentry->d_inode);
+       struct bch_inode_unpacked dst_dir_u, src_dir_u;
+       struct bch_inode_unpacked src_inode_u, dst_inode_u;
+       struct btree_trans trans;
+       enum bch_rename_mode mode = flags & RENAME_EXCHANGE
+               ? BCH_RENAME_EXCHANGE
+               : dst_dentry->d_inode
+               ? BCH_RENAME_OVERWRITE : BCH_RENAME;
+       u64 journal_seq = 0;
        int ret;
 
-       lockdep_assert_held(&dir->i_rwsem);
+       if (flags & ~(RENAME_NOREPLACE|RENAME_EXCHANGE))
+               return -EINVAL;
 
-       ret = __bch2_create(dir, dentry, mode|S_IFDIR, 0);
+       if (mode == BCH_RENAME_OVERWRITE) {
+               ret = filemap_write_and_wait_range(src_inode->v.i_mapping,
+                                                  0, LLONG_MAX);
+               if (ret)
+                       return ret;
+       }
+
+       bch2_trans_init(&trans, c, 8, 2048);
+
+       bch2_lock_inodes(INODE_UPDATE_LOCK,
+                        src_dir,
+                        dst_dir,
+                        src_inode,
+                        dst_inode);
+
+       if (inode_attr_changing(dst_dir, src_inode, Inode_opt_project)) {
+               ret = bch2_fs_quota_transfer(c, src_inode,
+                                            dst_dir->ei_qid,
+                                            1 << QTYP_PRJ,
+                                            KEY_TYPE_QUOTA_PREALLOC);
+               if (ret)
+                       goto err;
+       }
+
+       if (mode == BCH_RENAME_EXCHANGE &&
+           inode_attr_changing(src_dir, dst_inode, Inode_opt_project)) {
+               ret = bch2_fs_quota_transfer(c, dst_inode,
+                                            src_dir->ei_qid,
+                                            1 << QTYP_PRJ,
+                                            KEY_TYPE_QUOTA_PREALLOC);
+               if (ret)
+                       goto err;
+       }
+
+       ret = __bch2_trans_do(&trans, NULL, &journal_seq,
+                             BTREE_INSERT_NOUNLOCK,
+                       bch2_rename_trans(&trans,
+                                         src_dir->v.i_ino, &src_dir_u,
+                                         dst_dir->v.i_ino, &dst_dir_u,
+                                         &src_inode_u,
+                                         &dst_inode_u,
+                                         &src_dentry->d_name,
+                                         &dst_dentry->d_name,
+                                         mode));
        if (unlikely(ret))
-               return ret;
+               goto err;
 
-       bch2_inc_nlink(c, to_bch_ei(dir));
+       BUG_ON(src_inode->v.i_ino != src_inode_u.bi_inum);
+       BUG_ON(dst_inode &&
+              dst_inode->v.i_ino != dst_inode_u.bi_inum);
 
-       return 0;
-}
+       bch2_inode_update_after_write(c, src_dir, &src_dir_u,
+                                     ATTR_MTIME|ATTR_CTIME);
+       journal_seq_copy(c, src_dir, journal_seq);
 
-static int bch2_rmdir(struct inode *dir, struct dentry *dentry)
-{
-       struct bch_fs *c = dir->i_sb->s_fs_info;
-       struct inode *inode = dentry->d_inode;
+       if (src_dir != dst_dir) {
+               bch2_inode_update_after_write(c, dst_dir, &dst_dir_u,
+                                             ATTR_MTIME|ATTR_CTIME);
+               journal_seq_copy(c, dst_dir, journal_seq);
+       }
 
-       if (bch2_empty_dir(c, inode->i_ino))
-               return -ENOTEMPTY;
+       bch2_inode_update_after_write(c, src_inode, &src_inode_u,
+                                     ATTR_CTIME);
+       journal_seq_copy(c, src_inode, journal_seq);
 
-       return bch2_unlink(dir, dentry);
+       if (dst_inode) {
+               bch2_inode_update_after_write(c, dst_inode, &dst_inode_u,
+                                             ATTR_CTIME);
+               journal_seq_copy(c, dst_inode, journal_seq);
+       }
+err:
+       bch2_trans_exit(&trans);
+
+       bch2_fs_quota_transfer(c, src_inode,
+                              bch_qid(&src_inode->ei_inode),
+                              1 << QTYP_PRJ,
+                              KEY_TYPE_QUOTA_NOCHECK);
+       if (dst_inode)
+               bch2_fs_quota_transfer(c, dst_inode,
+                                      bch_qid(&dst_inode->ei_inode),
+                                      1 << QTYP_PRJ,
+                                      KEY_TYPE_QUOTA_NOCHECK);
+
+       bch2_unlock_inodes(INODE_UPDATE_LOCK,
+                          src_dir,
+                          dst_dir,
+                          src_inode,
+                          dst_inode);
+
+       return ret;
 }
 
-static int bch2_mknod(struct inode *dir, struct dentry *dentry,
-                     umode_t mode, dev_t rdev)
+void bch2_setattr_copy(struct bch_inode_info *inode,
+                      struct bch_inode_unpacked *bi,
+                      struct iattr *attr)
 {
-       return __bch2_create(dir, dentry, mode, rdev);
+       struct bch_fs *c = inode->v.i_sb->s_fs_info;
+       unsigned int ia_valid = attr->ia_valid;
+
+       if (ia_valid & ATTR_UID)
+               bi->bi_uid = from_kuid(c->vfs_sb->s_user_ns, attr->ia_uid);
+       if (ia_valid & ATTR_GID)
+               bi->bi_gid = from_kgid(c->vfs_sb->s_user_ns, attr->ia_gid);
+
+       if (ia_valid & ATTR_ATIME)
+               bi->bi_atime = timespec_to_bch2_time(c, attr->ia_atime);
+       if (ia_valid & ATTR_MTIME)
+               bi->bi_mtime = timespec_to_bch2_time(c, attr->ia_mtime);
+       if (ia_valid & ATTR_CTIME)
+               bi->bi_ctime = timespec_to_bch2_time(c, attr->ia_ctime);
+
+       if (ia_valid & ATTR_MODE) {
+               umode_t mode = attr->ia_mode;
+               kgid_t gid = ia_valid & ATTR_GID
+                       ? attr->ia_gid
+                       : inode->v.i_gid;
+
+               if (!in_group_p(gid) &&
+                   !capable_wrt_inode_uidgid(&inode->v, CAP_FSETID))
+                       mode &= ~S_ISGID;
+               bi->bi_mode = mode;
+       }
 }
 
-static int bch2_rename(struct inode *old_dir, struct dentry *old_dentry,
-                      struct inode *new_dir, struct dentry *new_dentry)
+static int bch2_setattr_nonsize(struct bch_inode_info *inode,
+                               struct iattr *attr)
 {
-       struct bch_fs *c = old_dir->i_sb->s_fs_info;
-       struct inode *old_inode = old_dentry->d_inode;
-       struct bch_inode_info *ei = to_bch_ei(old_inode);
-       struct inode *new_inode = new_dentry->d_inode;
-       struct timespec now = current_fs_time(old_dir->i_sb);
+       struct bch_fs *c = inode->v.i_sb->s_fs_info;
+       struct bch_qid qid;
+       struct btree_trans trans;
+       struct btree_iter *inode_iter;
+       struct bch_inode_unpacked inode_u;
+       struct posix_acl *acl = NULL;
        int ret;
 
-       lockdep_assert_held(&old_dir->i_rwsem);
-       lockdep_assert_held(&new_dir->i_rwsem);
-
-       if (new_inode)
-               filemap_write_and_wait_range(old_inode->i_mapping,
-                                            0, LLONG_MAX);
+       mutex_lock(&inode->ei_update_lock);
 
-       if (new_inode && S_ISDIR(old_inode->i_mode)) {
-               lockdep_assert_held(&new_inode->i_rwsem);
+       qid = inode->ei_qid;
 
-               if (!S_ISDIR(new_inode->i_mode))
-                       return -ENOTDIR;
+       if (attr->ia_valid & ATTR_UID)
+               qid.q[QTYP_USR] = from_kuid(&init_user_ns, attr->ia_uid);
 
-               if (bch2_empty_dir(c, new_inode->i_ino))
-                       return -ENOTEMPTY;
+       if (attr->ia_valid & ATTR_GID)
+               qid.q[QTYP_GRP] = from_kgid(&init_user_ns, attr->ia_gid);
 
-               ret = bch2_dirent_rename(c,
-                                       old_dir, &old_dentry->d_name,
-                                       new_dir, &new_dentry->d_name,
-                                       &ei->journal_seq, BCH_RENAME_OVERWRITE);
-               if (unlikely(ret))
-                       return ret;
+       ret = bch2_fs_quota_transfer(c, inode, qid, ~0,
+                                    KEY_TYPE_QUOTA_PREALLOC);
+       if (ret)
+               goto err;
 
-               clear_nlink(new_inode);
-               bch2_dec_nlink(c, to_bch_ei(old_dir));
-       } else if (new_inode) {
-               lockdep_assert_held(&new_inode->i_rwsem);
+       bch2_trans_init(&trans, c, 0, 0);
+retry:
+       bch2_trans_begin(&trans);
+       kfree(acl);
+       acl = NULL;
 
-               ret = bch2_dirent_rename(c,
-                                       old_dir, &old_dentry->d_name,
-                                       new_dir, &new_dentry->d_name,
-                                       &ei->journal_seq, BCH_RENAME_OVERWRITE);
-               if (unlikely(ret))
-                       return ret;
+       inode_iter = bch2_inode_peek(&trans, &inode_u, inode->v.i_ino,
+                                    BTREE_ITER_INTENT);
+       ret = PTR_ERR_OR_ZERO(inode_iter);
+       if (ret)
+               goto btree_err;
 
-               new_inode->i_ctime = now;
-               bch2_dec_nlink(c, to_bch_ei(new_inode));
-       } else if (S_ISDIR(old_inode->i_mode)) {
-               ret = bch2_dirent_rename(c,
-                                       old_dir, &old_dentry->d_name,
-                                       new_dir, &new_dentry->d_name,
-                                       &ei->journal_seq, BCH_RENAME);
-               if (unlikely(ret))
-                       return ret;
+       bch2_setattr_copy(inode, &inode_u, attr);
 
-               bch2_inc_nlink(c, to_bch_ei(new_dir));
-               bch2_dec_nlink(c, to_bch_ei(old_dir));
-       } else {
-               ret = bch2_dirent_rename(c,
-                                       old_dir, &old_dentry->d_name,
-                                       new_dir, &new_dentry->d_name,
-                                       &ei->journal_seq, BCH_RENAME);
-               if (unlikely(ret))
-                       return ret;
+       if (attr->ia_valid & ATTR_MODE) {
+               ret = bch2_acl_chmod(&trans, &inode_u, inode_u.bi_mode, &acl);
+               if (ret)
+                       goto btree_err;
        }
 
-       old_dir->i_ctime = old_dir->i_mtime = now;
-       new_dir->i_ctime = new_dir->i_mtime = now;
-       mark_inode_dirty_sync(old_dir);
-       mark_inode_dirty_sync(new_dir);
+       ret =   bch2_inode_write(&trans, inode_iter, &inode_u) ?:
+               bch2_trans_commit(&trans, NULL,
+                                 &inode->ei_journal_seq,
+                                 BTREE_INSERT_NOUNLOCK|
+                                 BTREE_INSERT_NOFAIL);
+btree_err:
+       bch2_trans_iter_put(&trans, inode_iter);
 
-       old_inode->i_ctime = now;
-       mark_inode_dirty_sync(old_inode);
-
-       return 0;
-}
-
-static int bch2_rename_exchange(struct inode *old_dir, struct dentry *old_dentry,
-                               struct inode *new_dir, struct dentry *new_dentry)
-{
-       struct bch_fs *c = old_dir->i_sb->s_fs_info;
-       struct inode *old_inode = old_dentry->d_inode;
-       struct inode *new_inode = new_dentry->d_inode;
-       struct bch_inode_info *ei = to_bch_ei(old_inode);
-       struct timespec now = current_fs_time(old_dir->i_sb);
-       int ret;
-
-       ret = bch2_dirent_rename(c,
-                               old_dir, &old_dentry->d_name,
-                               new_dir, &new_dentry->d_name,
-                               &ei->journal_seq, BCH_RENAME_EXCHANGE);
+       if (ret == -EINTR)
+               goto retry;
        if (unlikely(ret))
-               return ret;
+               goto err_trans;
 
-       if (S_ISDIR(old_inode->i_mode) !=
-           S_ISDIR(new_inode->i_mode)) {
-               if (S_ISDIR(old_inode->i_mode)) {
-                       bch2_inc_nlink(c, to_bch_ei(new_dir));
-                       bch2_dec_nlink(c, to_bch_ei(old_dir));
-               } else {
-                       bch2_dec_nlink(c, to_bch_ei(new_dir));
-                       bch2_inc_nlink(c, to_bch_ei(old_dir));
-               }
-       }
+       bch2_inode_update_after_write(c, inode, &inode_u, attr->ia_valid);
 
-       old_dir->i_ctime = old_dir->i_mtime = now;
-       new_dir->i_ctime = new_dir->i_mtime = now;
-       mark_inode_dirty_sync(old_dir);
-       mark_inode_dirty_sync(new_dir);
-
-       old_inode->i_ctime = now;
-       new_inode->i_ctime = now;
-       mark_inode_dirty_sync(old_inode);
-       mark_inode_dirty_sync(new_inode);
+       if (acl)
+               set_cached_acl(&inode->v, ACL_TYPE_ACCESS, acl);
+err_trans:
+       bch2_trans_exit(&trans);
+err:
+       mutex_unlock(&inode->ei_update_lock);
 
-       return 0;
+       return ret;
 }
 
-static int bch2_rename2(struct inode *old_dir, struct dentry *old_dentry,
-                       struct inode *new_dir, struct dentry *new_dentry,
-                       unsigned flags)
+static int bch2_getattr(const struct path *path, struct kstat *stat,
+                       u32 request_mask, unsigned query_flags)
 {
-       if (flags & ~(RENAME_NOREPLACE|RENAME_EXCHANGE))
-               return -EINVAL;
+       struct bch_inode_info *inode = to_bch_ei(d_inode(path->dentry));
+       struct bch_fs *c = inode->v.i_sb->s_fs_info;
+
+       stat->dev       = inode->v.i_sb->s_dev;
+       stat->ino       = inode->v.i_ino;
+       stat->mode      = inode->v.i_mode;
+       stat->nlink     = inode->v.i_nlink;
+       stat->uid       = inode->v.i_uid;
+       stat->gid       = inode->v.i_gid;
+       stat->rdev      = inode->v.i_rdev;
+       stat->size      = i_size_read(&inode->v);
+       stat->atime     = inode->v.i_atime;
+       stat->mtime     = inode->v.i_mtime;
+       stat->ctime     = inode->v.i_ctime;
+       stat->blksize   = block_bytes(c);
+       stat->blocks    = inode->v.i_blocks;
+
+       if (request_mask & STATX_BTIME) {
+               stat->result_mask |= STATX_BTIME;
+               stat->btime = bch2_time_to_timespec(c, inode->ei_inode.bi_otime);
+       }
+
+       if (inode->ei_inode.bi_flags & BCH_INODE_IMMUTABLE)
+               stat->attributes |= STATX_ATTR_IMMUTABLE;
+       stat->attributes_mask    |= STATX_ATTR_IMMUTABLE;
 
-       if (flags & RENAME_EXCHANGE)
-               return bch2_rename_exchange(old_dir, old_dentry,
-                                          new_dir, new_dentry);
+       if (inode->ei_inode.bi_flags & BCH_INODE_APPEND)
+               stat->attributes |= STATX_ATTR_APPEND;
+       stat->attributes_mask    |= STATX_ATTR_APPEND;
 
-       return bch2_rename(old_dir, old_dentry, new_dir, new_dentry);
+       if (inode->ei_inode.bi_flags & BCH_INODE_NODUMP)
+               stat->attributes |= STATX_ATTR_NODUMP;
+       stat->attributes_mask    |= STATX_ATTR_NODUMP;
+
+       return 0;
 }
 
 static int bch2_setattr(struct dentry *dentry, struct iattr *iattr)
 {
-       struct inode *inode = dentry->d_inode;
-       struct bch_inode_info *ei = to_bch_ei(inode);
-       struct bch_fs *c = inode->i_sb->s_fs_info;
-       int ret = 0;
-
-       lockdep_assert_held(&inode->i_rwsem);
+       struct bch_inode_info *inode = to_bch_ei(dentry->d_inode);
+       int ret;
 
-       pr_debug("i_size was %llu update has %llu",
-                inode->i_size, iattr->ia_size);
+       lockdep_assert_held(&inode->v.i_rwsem);
 
        ret = setattr_prepare(dentry, iattr);
        if (ret)
                return ret;
 
-       if (iattr->ia_valid & ATTR_SIZE) {
-               ret = bch2_truncate(inode, iattr);
-       } else {
-               mutex_lock(&ei->update_lock);
-               setattr_copy(inode, iattr);
-               ret = bch2_write_inode(c, ei);
-               mutex_unlock(&ei->update_lock);
-       }
-
-       if (unlikely(ret))
-               return ret;
-
-       if (iattr->ia_valid & ATTR_MODE)
-               ret = posix_acl_chmod(inode, inode->i_mode);
-
-       return ret;
+       return iattr->ia_valid & ATTR_SIZE
+               ? bch2_truncate(inode, iattr)
+               : bch2_setattr_nonsize(inode, iattr);
 }
 
-static int bch2_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
+static int bch2_tmpfile(struct inode *vdir, struct dentry *dentry, umode_t mode)
 {
-       struct bch_fs *c = dir->i_sb->s_fs_info;
-       struct inode *inode;
+       struct bch_inode_info *inode =
+               __bch2_create(to_bch_ei(vdir), dentry, mode, 0, true);
 
-       /* XXX: i_nlink should be 0? */
-       inode = bch2_vfs_inode_create(c, dir, mode, 0);
-       if (unlikely(IS_ERR(inode)))
+       if (IS_ERR(inode))
                return PTR_ERR(inode);
 
-       d_tmpfile(dentry, inode);
+       d_mark_tmpfile(dentry, &inode->v);
+       d_instantiate(dentry, &inode->v);
        return 0;
 }
 
-static int bch2_fill_extent(struct fiemap_extent_info *info,
-                           const struct bkey_i *k, unsigned flags)
+static int bch2_fill_extent(struct bch_fs *c,
+                           struct fiemap_extent_info *info,
+                           struct bkey_s_c k, unsigned flags)
 {
-       if (bkey_extent_is_data(&k->k)) {
-               struct bkey_s_c_extent e = bkey_i_to_s_c_extent(k);
-               const struct bch_extent_ptr *ptr;
-               const union bch_extent_crc *crc;
+       if (bkey_extent_is_direct_data(k.k)) {
+               struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);
+               const union bch_extent_entry *entry;
+               struct extent_ptr_decoded p;
                int ret;
 
-               extent_for_each_ptr_crc(e, ptr, crc) {
+               if (k.k->type == KEY_TYPE_reflink_v)
+                       flags |= FIEMAP_EXTENT_SHARED;
+
+               bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {
                        int flags2 = 0;
-                       u64 offset = ptr->offset;
+                       u64 offset = p.ptr.offset;
 
-                       if (crc_compression_type(crc))
+                       if (p.crc.compression_type)
                                flags2 |= FIEMAP_EXTENT_ENCODED;
                        else
-                               offset += crc_offset(crc);
+                               offset += p.crc.offset;
 
-                       if ((offset & (PAGE_SECTORS - 1)) ||
-                           (e.k->size & (PAGE_SECTORS - 1)))
+                       if ((offset & (c->opts.block_size - 1)) ||
+                           (k.k->size & (c->opts.block_size - 1)))
                                flags2 |= FIEMAP_EXTENT_NOT_ALIGNED;
 
                        ret = fiemap_fill_next_extent(info,
-                                                     bkey_start_offset(e.k) << 9,
-                                                     offset << 9,
-                                                     e.k->size << 9, flags|flags2);
+                                               bkey_start_offset(k.k) << 9,
+                                               offset << 9,
+                                               k.k->size << 9, flags|flags2);
                        if (ret)
                                return ret;
                }
 
                return 0;
-       } else if (k->k.type == BCH_RESERVATION) {
+       } else if (bkey_extent_is_inline_data(k.k)) {
+               return fiemap_fill_next_extent(info,
+                                              bkey_start_offset(k.k) << 9,
+                                              0, k.k->size << 9,
+                                              flags|
+                                              FIEMAP_EXTENT_DATA_INLINE);
+       } else if (k.k->type == KEY_TYPE_reservation) {
                return fiemap_fill_next_extent(info,
-                                              bkey_start_offset(&k->k) << 9,
-                                              0, k->k.size << 9,
+                                              bkey_start_offset(k.k) << 9,
+                                              0, k.k->size << 9,
                                               flags|
                                               FIEMAP_EXTENT_DELALLOC|
                                               FIEMAP_EXTENT_UNWRITTEN);
@@ -701,226 +866,110 @@ static int bch2_fill_extent(struct fiemap_extent_info *info,
        }
 }
 
-static int bch2_fiemap(struct inode *inode, struct fiemap_extent_info *info,
+static int bch2_fiemap(struct inode *vinode, struct fiemap_extent_info *info,
                       u64 start, u64 len)
 {
-       struct bch_fs *c = inode->i_sb->s_fs_info;
-       struct btree_iter iter;
+       struct bch_fs *c = vinode->i_sb->s_fs_info;
+       struct bch_inode_info *ei = to_bch_ei(vinode);
+       struct btree_trans trans;
+       struct btree_iter *iter;
        struct bkey_s_c k;
-       BKEY_PADDED(k) tmp;
+       struct bkey_buf cur, prev;
+       struct bpos end = POS(ei->v.i_ino, (start + len) >> 9);
+       unsigned offset_into_extent, sectors;
        bool have_extent = false;
        int ret = 0;
 
+       ret = fiemap_prep(&ei->v, info, start, &len, FIEMAP_FLAG_SYNC);
+       if (ret)
+               return ret;
+
        if (start + len < start)
                return -EINVAL;
 
-       for_each_btree_key(&iter, c, BTREE_ID_EXTENTS,
-                          POS(inode->i_ino, start >> 9), 0, k)
-               if (bkey_extent_is_data(k.k) ||
-                   k.k->type == BCH_RESERVATION) {
-                       if (bkey_cmp(bkey_start_pos(k.k),
-                                    POS(inode->i_ino, (start + len) >> 9)) >= 0)
-                               break;
-
-                       if (have_extent) {
-                               ret = bch2_fill_extent(info, &tmp.k, 0);
-                               if (ret)
-                                       goto out;
-                       }
-
-                       bkey_reassemble(&tmp.k, k);
-                       have_extent = true;
+       bch2_bkey_buf_init(&cur);
+       bch2_bkey_buf_init(&prev);
+       bch2_trans_init(&trans, c, 0, 0);
+
+       iter = bch2_trans_get_iter(&trans, BTREE_ID_extents,
+                                  POS(ei->v.i_ino, start >> 9), 0);
+retry:
+       while ((k = bch2_btree_iter_peek(iter)).k &&
+              !(ret = bkey_err(k)) &&
+              bkey_cmp(iter->pos, end) < 0) {
+               enum btree_id data_btree = BTREE_ID_extents;
+
+               if (!bkey_extent_is_data(k.k) &&
+                   k.k->type != KEY_TYPE_reservation) {
+                       bch2_btree_iter_next(iter);
+                       continue;
                }
 
-       if (have_extent)
-               ret = bch2_fill_extent(info, &tmp.k, FIEMAP_EXTENT_LAST);
-out:
-       bch2_btree_iter_unlock(&iter);
-       return ret < 0 ? ret : 0;
-}
-
-static const struct vm_operations_struct bch_vm_ops = {
-       .fault          = filemap_fault,
-       .map_pages      = filemap_map_pages,
-       .page_mkwrite   = bch2_page_mkwrite,
-};
-
-static int bch2_mmap(struct file *file, struct vm_area_struct *vma)
-{
-       file_accessed(file);
-
-       vma->vm_ops = &bch_vm_ops;
-       return 0;
-}
-
-/* Inode flags: */
-
-static const unsigned bch_inode_flags_to_vfs_flags_map[] = {
-       [__BCH_INODE_SYNC]      = S_SYNC,
-       [__BCH_INODE_IMMUTABLE] = S_IMMUTABLE,
-       [__BCH_INODE_APPEND]    = S_APPEND,
-       [__BCH_INODE_NOATIME]   = S_NOATIME,
-};
-
-static const unsigned bch_inode_flags_to_user_flags_map[] = {
-       [__BCH_INODE_SYNC]      = FS_SYNC_FL,
-       [__BCH_INODE_IMMUTABLE] = FS_IMMUTABLE_FL,
-       [__BCH_INODE_APPEND]    = FS_APPEND_FL,
-       [__BCH_INODE_NODUMP]    = FS_NODUMP_FL,
-       [__BCH_INODE_NOATIME]   = FS_NOATIME_FL,
-};
+               offset_into_extent      = iter->pos.offset -
+                       bkey_start_offset(k.k);
+               sectors                 = k.k->size - offset_into_extent;
 
-/* Set VFS inode flags from bcachefs inode: */
-static void bch2_inode_flags_to_vfs(struct inode *inode)
-{
-       unsigned i, flags = to_bch_ei(inode)->i_flags;
+               bch2_bkey_buf_reassemble(&cur, c, k);
 
-       for (i = 0; i < ARRAY_SIZE(bch_inode_flags_to_vfs_flags_map); i++)
-               if (flags & (1 << i))
-                       inode->i_flags |=  bch_inode_flags_to_vfs_flags_map[i];
-               else
-                       inode->i_flags &= ~bch_inode_flags_to_vfs_flags_map[i];
-}
+               ret = bch2_read_indirect_extent(&trans, &data_btree,
+                                       &offset_into_extent, &cur);
+               if (ret)
+                       break;
 
-/* Get FS_IOC_GETFLAGS flags from bcachefs inode: */
-static unsigned bch2_inode_flags_to_user_flags(unsigned flags)
-{
-       unsigned i, ret = 0;
+               k = bkey_i_to_s_c(cur.k);
+               bch2_bkey_buf_realloc(&prev, c, k.k->u64s);
 
-       for (i = 0; i < ARRAY_SIZE(bch_inode_flags_to_user_flags_map); i++)
-               if (flags & (1 << i))
-                       ret |= bch_inode_flags_to_user_flags_map[i];
+               sectors = min(sectors, k.k->size - offset_into_extent);
 
-       return ret;
-}
+               bch2_cut_front(POS(k.k->p.inode,
+                                  bkey_start_offset(k.k) +
+                                  offset_into_extent),
+                              cur.k);
+               bch2_key_resize(&cur.k->k, sectors);
+               cur.k->k.p = iter->pos;
+               cur.k->k.p.offset += cur.k->k.size;
 
-static int bch2_inode_user_flags_set(struct bch_inode_info *ei,
-                                    struct bch_inode_unpacked *bi,
-                                    void *p)
-{
-       /*
-        * We're relying on btree locking here for exclusion with other ioctl
-        * calls - use the flags in the btree (@bi), not ei->i_flags:
-        */
-       unsigned bch_flags = bi->i_flags;
-       unsigned oldflags = bch2_inode_flags_to_user_flags(bch_flags);
-       unsigned newflags = *((unsigned *) p);
-       unsigned i;
-
-       if (((newflags ^ oldflags) & (FS_APPEND_FL|FS_IMMUTABLE_FL)) &&
-           !capable(CAP_LINUX_IMMUTABLE))
-               return -EPERM;
+               if (have_extent) {
+                       ret = bch2_fill_extent(c, info,
+                                       bkey_i_to_s_c(prev.k), 0);
+                       if (ret)
+                               break;
+               }
 
-       for (i = 0; i < ARRAY_SIZE(bch_inode_flags_to_user_flags_map); i++) {
-               if (newflags & bch_inode_flags_to_user_flags_map[i])
-                       bch_flags |=  (1 << i);
-               else
-                       bch_flags &= ~(1 << i);
+               bkey_copy(prev.k, cur.k);
+               have_extent = true;
 
-               newflags &= ~bch_inode_flags_to_user_flags_map[i];
-               oldflags &= ~bch_inode_flags_to_user_flags_map[i];
+               bch2_btree_iter_set_pos(iter,
+                       POS(iter->pos.inode, iter->pos.offset + sectors));
        }
 
-       if (oldflags != newflags)
-               return -EOPNOTSUPP;
+       if (ret == -EINTR)
+               goto retry;
 
-       bi->i_flags = bch_flags;
-       ei->vfs_inode.i_ctime = current_fs_time(ei->vfs_inode.i_sb);
+       if (!ret && have_extent)
+               ret = bch2_fill_extent(c, info, bkey_i_to_s_c(prev.k),
+                                      FIEMAP_EXTENT_LAST);
 
-       return 0;
+       bch2_trans_iter_put(&trans, iter);
+       ret = bch2_trans_exit(&trans) ?: ret;
+       bch2_bkey_buf_exit(&cur, c);
+       bch2_bkey_buf_exit(&prev, c);
+       return ret < 0 ? ret : 0;
 }
 
-#define FS_IOC_GOINGDOWN            _IOR ('X', 125, __u32)
+static const struct vm_operations_struct bch_vm_ops = {
+       .fault          = bch2_page_fault,
+       .map_pages      = filemap_map_pages,
+       .page_mkwrite   = bch2_page_mkwrite,
+};
 
-static long bch2_fs_file_ioctl(struct file *filp, unsigned int cmd,
-                              unsigned long arg)
+static int bch2_mmap(struct file *file, struct vm_area_struct *vma)
 {
-       struct inode *inode = file_inode(filp);
-       struct super_block *sb = inode->i_sb;
-       struct bch_fs *c = sb->s_fs_info;
-       struct bch_inode_info *ei = to_bch_ei(inode);
-       unsigned flags;
-       int ret;
-
-       switch (cmd) {
-       case FS_IOC_GETFLAGS:
-               return put_user(bch2_inode_flags_to_user_flags(ei->i_flags),
-                               (int __user *) arg);
-
-       case FS_IOC_SETFLAGS: {
-               ret = mnt_want_write_file(filp);
-               if (ret)
-                       return ret;
-
-               if (!inode_owner_or_capable(inode)) {
-                       ret = -EACCES;
-                       goto setflags_out;
-               }
-
-               if (get_user(flags, (int __user *) arg)) {
-                       ret = -EFAULT;
-                       goto setflags_out;
-               }
-
-               if (!S_ISREG(inode->i_mode) &&
-                   !S_ISDIR(inode->i_mode) &&
-                   (flags & (FS_NODUMP_FL|FS_NOATIME_FL)) != flags) {
-                       ret = -EINVAL;
-                       goto setflags_out;
-               }
-
-               inode_lock(inode);
-
-               mutex_lock(&ei->update_lock);
-               ret = __bch2_write_inode(c, ei, bch2_inode_user_flags_set, &flags);
-               mutex_unlock(&ei->update_lock);
-
-               if (!ret)
-                       bch2_inode_flags_to_vfs(inode);
-
-               inode_unlock(inode);
-setflags_out:
-               mnt_drop_write_file(filp);
-               return ret;
-       }
-
-       case FS_IOC_GETVERSION:
-               return -ENOTTY;
-       case FS_IOC_SETVERSION:
-               return -ENOTTY;
-
-       case FS_IOC_GOINGDOWN:
-               if (!capable(CAP_SYS_ADMIN))
-                       return -EPERM;
-
-               down_write(&sb->s_umount);
-               sb->s_flags |= MS_RDONLY;
-               bch2_fs_emergency_read_only(c);
-               up_write(&sb->s_umount);
-               return 0;
-
-       default:
-               return bch2_fs_ioctl(c, cmd, (void __user *) arg);
-       }
-}
+       file_accessed(file);
 
-#ifdef CONFIG_COMPAT
-static long bch2_compat_fs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-{
-       /* These are just misnamed, they actually get/put from/to user an int */
-       switch (cmd) {
-       case FS_IOC_GETFLAGS:
-               cmd = FS_IOC_GETFLAGS;
-               break;
-       case FS_IOC32_SETFLAGS:
-               cmd = FS_IOC_SETFLAGS;
-               break;
-       default:
-               return -ENOIOCTLCMD;
-       }
-       return bch2_fs_file_ioctl(file, cmd, (unsigned long) compat_ptr(arg));
+       vma->vm_ops = &bch_vm_ops;
+       return 0;
 }
-#endif
 
 /* Directories: */
 
@@ -932,34 +981,44 @@ static loff_t bch2_dir_llseek(struct file *file, loff_t offset, int whence)
 
 static int bch2_vfs_readdir(struct file *file, struct dir_context *ctx)
 {
-       struct inode *inode = file_inode(file);
-       struct bch_fs *c = inode->i_sb->s_fs_info;
+       struct bch_inode_info *inode = file_bch_inode(file);
+       struct bch_fs *c = inode->v.i_sb->s_fs_info;
+
+       if (!dir_emit_dots(file, ctx))
+               return 0;
 
-       return bch2_readdir(c, file, ctx);
+       return bch2_readdir(c, inode->v.i_ino, ctx);
 }
 
 static const struct file_operations bch_file_operations = {
        .llseek         = bch2_llseek,
-       .read_iter      = generic_file_read_iter,
+       .read_iter      = bch2_read_iter,
        .write_iter     = bch2_write_iter,
        .mmap           = bch2_mmap,
        .open           = generic_file_open,
        .fsync          = bch2_fsync,
        .splice_read    = generic_file_splice_read,
+#if 0
+       /* Busted: */
        .splice_write   = iter_file_splice_write,
+#endif
        .fallocate      = bch2_fallocate_dispatch,
        .unlocked_ioctl = bch2_fs_file_ioctl,
 #ifdef CONFIG_COMPAT
        .compat_ioctl   = bch2_compat_fs_ioctl,
 #endif
+       .remap_file_range = bch2_remap_file_range,
 };
 
 static const struct inode_operations bch_file_inode_operations = {
+       .getattr        = bch2_getattr,
        .setattr        = bch2_setattr,
        .fiemap         = bch2_fiemap,
        .listxattr      = bch2_xattr_list,
+#ifdef CONFIG_BCACHEFS_POSIX_ACL
        .get_acl        = bch2_get_acl,
        .set_acl        = bch2_set_acl,
+#endif
 };
 
 static const struct inode_operations bch_dir_inode_operations = {
@@ -969,20 +1028,23 @@ static const struct inode_operations bch_dir_inode_operations = {
        .unlink         = bch2_unlink,
        .symlink        = bch2_symlink,
        .mkdir          = bch2_mkdir,
-       .rmdir          = bch2_rmdir,
+       .rmdir          = bch2_unlink,
        .mknod          = bch2_mknod,
        .rename         = bch2_rename2,
+       .getattr        = bch2_getattr,
        .setattr        = bch2_setattr,
        .tmpfile        = bch2_tmpfile,
        .listxattr      = bch2_xattr_list,
+#ifdef CONFIG_BCACHEFS_POSIX_ACL
        .get_acl        = bch2_get_acl,
        .set_acl        = bch2_set_acl,
+#endif
 };
 
 static const struct file_operations bch_dir_file_operations = {
        .llseek         = bch2_dir_llseek,
        .read           = generic_read_dir,
-       .iterate        = bch2_vfs_readdir,
+       .iterate_shared = bch2_vfs_readdir,
        .fsync          = bch2_fsync,
        .unlocked_ioctl = bch2_fs_file_ioctl,
 #ifdef CONFIG_COMPAT
@@ -992,159 +1054,196 @@ static const struct file_operations bch_dir_file_operations = {
 
 static const struct inode_operations bch_symlink_inode_operations = {
        .get_link       = page_get_link,
+       .getattr        = bch2_getattr,
        .setattr        = bch2_setattr,
        .listxattr      = bch2_xattr_list,
+#ifdef CONFIG_BCACHEFS_POSIX_ACL
        .get_acl        = bch2_get_acl,
        .set_acl        = bch2_set_acl,
+#endif
 };
 
 static const struct inode_operations bch_special_inode_operations = {
+       .getattr        = bch2_getattr,
        .setattr        = bch2_setattr,
        .listxattr      = bch2_xattr_list,
+#ifdef CONFIG_BCACHEFS_POSIX_ACL
        .get_acl        = bch2_get_acl,
        .set_acl        = bch2_set_acl,
+#endif
 };
 
 static const struct address_space_operations bch_address_space_operations = {
        .writepage      = bch2_writepage,
        .readpage       = bch2_readpage,
        .writepages     = bch2_writepages,
-       .readpages      = bch2_readpages,
-       .set_page_dirty = bch2_set_page_dirty,
+       .readahead      = bch2_readahead,
+       .set_page_dirty = __set_page_dirty_nobuffers,
        .write_begin    = bch2_write_begin,
        .write_end      = bch2_write_end,
        .invalidatepage = bch2_invalidatepage,
        .releasepage    = bch2_releasepage,
-       .direct_IO      = bch2_direct_IO,
+       .direct_IO      = noop_direct_IO,
 #ifdef CONFIG_MIGRATION
        .migratepage    = bch2_migrate_page,
 #endif
        .error_remove_page = generic_error_remove_page,
 };
 
-static void bch2_vfs_inode_init(struct bch_fs *c,
-                               struct bch_inode_info *ei,
-                               struct bch_inode_unpacked *bi)
+static struct inode *bch2_nfs_get_inode(struct super_block *sb,
+               u64 ino, u32 generation)
 {
-       struct inode *inode = &ei->vfs_inode;
+       struct bch_fs *c = sb->s_fs_info;
+       struct inode *vinode;
+
+       if (ino < BCACHEFS_ROOT_INO)
+               return ERR_PTR(-ESTALE);
+
+       vinode = bch2_vfs_inode_get(c, ino);
+       if (IS_ERR(vinode))
+               return ERR_CAST(vinode);
+       if (generation && vinode->i_generation != generation) {
+               /* we didn't find the right inode.. */
+               iput(vinode);
+               return ERR_PTR(-ESTALE);
+       }
+       return vinode;
+}
 
-       pr_debug("init inode %llu with mode %o",
-                bi->inum, bi->i_mode);
+static struct dentry *bch2_fh_to_dentry(struct super_block *sb, struct fid *fid,
+               int fh_len, int fh_type)
+{
+       return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
+                                   bch2_nfs_get_inode);
+}
 
-       ei->i_flags     = bi->i_flags;
-       ei->i_size      = bi->i_size;
+static struct dentry *bch2_fh_to_parent(struct super_block *sb, struct fid *fid,
+               int fh_len, int fh_type)
+{
+       return generic_fh_to_parent(sb, fid, fh_len, fh_type,
+                                   bch2_nfs_get_inode);
+}
 
-       inode->i_mode   = bi->i_mode;
-       i_uid_write(inode, bi->i_uid);
-       i_gid_write(inode, bi->i_gid);
+static const struct export_operations bch_export_ops = {
+       .fh_to_dentry   = bch2_fh_to_dentry,
+       .fh_to_parent   = bch2_fh_to_parent,
+       //.get_parent   = bch2_get_parent,
+};
 
-       atomic64_set(&ei->i_sectors, bi->i_sectors);
-       inode->i_blocks = bi->i_sectors;
+static void bch2_vfs_inode_init(struct bch_fs *c,
+                               struct bch_inode_info *inode,
+                               struct bch_inode_unpacked *bi)
+{
+       bch2_inode_update_after_write(c, inode, bi, ~0);
 
-       inode->i_ino    = bi->inum;
-       set_nlink(inode, bi->i_nlink + nlink_bias(inode->i_mode));
-       inode->i_rdev   = bi->i_dev;
-       inode->i_generation = bi->i_generation;
-       inode->i_size   = bi->i_size;
-       inode->i_atime  = bch2_time_to_timespec(c, bi->i_atime);
-       inode->i_mtime  = bch2_time_to_timespec(c, bi->i_mtime);
-       inode->i_ctime  = bch2_time_to_timespec(c, bi->i_ctime);
-       bch2_inode_flags_to_vfs(inode);
+       inode->v.i_blocks       = bi->bi_sectors;
+       inode->v.i_ino          = bi->bi_inum;
+       inode->v.i_rdev         = bi->bi_dev;
+       inode->v.i_generation   = bi->bi_generation;
+       inode->v.i_size         = bi->bi_size;
 
-       ei->str_hash = bch2_hash_info_init(c, bi);
+       inode->ei_flags         = 0;
+       inode->ei_journal_seq   = 0;
+       inode->ei_quota_reserved = 0;
+       inode->ei_qid           = bch_qid(bi);
 
-       inode->i_mapping->a_ops = &bch_address_space_operations;
+       inode->v.i_mapping->a_ops = &bch_address_space_operations;
 
-       switch (inode->i_mode & S_IFMT) {
+       switch (inode->v.i_mode & S_IFMT) {
        case S_IFREG:
-               inode->i_op = &bch_file_inode_operations;
-               inode->i_fop = &bch_file_operations;
+               inode->v.i_op   = &bch_file_inode_operations;
+               inode->v.i_fop  = &bch_file_operations;
                break;
        case S_IFDIR:
-               inode->i_op = &bch_dir_inode_operations;
-               inode->i_fop = &bch_dir_file_operations;
+               inode->v.i_op   = &bch_dir_inode_operations;
+               inode->v.i_fop  = &bch_dir_file_operations;
                break;
        case S_IFLNK:
-               inode_nohighmem(inode);
-               inode->i_op = &bch_symlink_inode_operations;
+               inode_nohighmem(&inode->v);
+               inode->v.i_op   = &bch_symlink_inode_operations;
                break;
        default:
-               init_special_inode(inode, inode->i_mode, inode->i_rdev);
-               inode->i_op = &bch_special_inode_operations;
+               init_special_inode(&inode->v, inode->v.i_mode, inode->v.i_rdev);
+               inode->v.i_op   = &bch_special_inode_operations;
                break;
        }
 }
 
 static struct inode *bch2_alloc_inode(struct super_block *sb)
 {
-       struct bch_inode_info *ei;
+       struct bch_inode_info *inode;
 
-       ei = kmem_cache_alloc(bch2_inode_cache, GFP_NOFS);
-       if (!ei)
+       inode = kmem_cache_alloc(bch2_inode_cache, GFP_NOFS);
+       if (!inode)
                return NULL;
 
-       pr_debug("allocated %p", &ei->vfs_inode);
-
-       inode_init_once(&ei->vfs_inode);
-       mutex_init(&ei->update_lock);
-       ei->journal_seq = 0;
-       atomic_long_set(&ei->i_size_dirty_count, 0);
-       atomic_long_set(&ei->i_sectors_dirty_count, 0);
+       inode_init_once(&inode->v);
+       mutex_init(&inode->ei_update_lock);
+       pagecache_lock_init(&inode->ei_pagecache_lock);
+       mutex_init(&inode->ei_quota_lock);
+       inode->ei_journal_seq = 0;
 
-       return &ei->vfs_inode;
+       return &inode->v;
 }
 
 static void bch2_i_callback(struct rcu_head *head)
 {
-       struct inode *inode = container_of(head, struct inode, i_rcu);
+       struct inode *vinode = container_of(head, struct inode, i_rcu);
+       struct bch_inode_info *inode = to_bch_ei(vinode);
 
-       kmem_cache_free(bch2_inode_cache, to_bch_ei(inode));
+       kmem_cache_free(bch2_inode_cache, inode);
 }
 
-static void bch2_destroy_inode(struct inode *inode)
+static void bch2_destroy_inode(struct inode *vinode)
 {
-       call_rcu(&inode->i_rcu, bch2_i_callback);
+       call_rcu(&vinode->i_rcu, bch2_i_callback);
 }
 
-static int bch2_vfs_write_inode(struct inode *inode,
-                               struct writeback_control *wbc)
+static int inode_update_times_fn(struct bch_inode_info *inode,
+                                struct bch_inode_unpacked *bi,
+                                void *p)
 {
-       struct bch_fs *c = inode->i_sb->s_fs_info;
-       struct bch_inode_info *ei = to_bch_ei(inode);
-       int ret;
+       struct bch_fs *c = inode->v.i_sb->s_fs_info;
 
-       mutex_lock(&ei->update_lock);
-       ret = bch2_write_inode(c, ei);
-       mutex_unlock(&ei->update_lock);
+       bi->bi_atime    = timespec_to_bch2_time(c, inode->v.i_atime);
+       bi->bi_mtime    = timespec_to_bch2_time(c, inode->v.i_mtime);
+       bi->bi_ctime    = timespec_to_bch2_time(c, inode->v.i_ctime);
 
-       if (c->opts.journal_flush_disabled)
-               return ret;
+       return 0;
+}
+
+static int bch2_vfs_write_inode(struct inode *vinode,
+                               struct writeback_control *wbc)
+{
+       struct bch_fs *c = vinode->i_sb->s_fs_info;
+       struct bch_inode_info *inode = to_bch_ei(vinode);
+       int ret;
 
-       if (!ret && wbc->sync_mode == WB_SYNC_ALL)
-               ret = bch2_journal_flush_seq(&c->journal, ei->journal_seq);
+       mutex_lock(&inode->ei_update_lock);
+       ret = bch2_write_inode(c, inode, inode_update_times_fn, NULL,
+                              ATTR_ATIME|ATTR_MTIME|ATTR_CTIME);
+       mutex_unlock(&inode->ei_update_lock);
 
        return ret;
 }
 
-static void bch2_evict_inode(struct inode *inode)
+static void bch2_evict_inode(struct inode *vinode)
 {
-       struct bch_fs *c = inode->i_sb->s_fs_info;
+       struct bch_fs *c = vinode->i_sb->s_fs_info;
+       struct bch_inode_info *inode = to_bch_ei(vinode);
 
-       truncate_inode_pages_final(&inode->i_data);
+       truncate_inode_pages_final(&inode->v.i_data);
 
-       if (!bch2_journal_error(&c->journal) && !is_bad_inode(inode)) {
-               struct bch_inode_info *ei = to_bch_ei(inode);
+       clear_inode(&inode->v);
 
-               /* XXX - we want to check this stuff iff there weren't IO errors: */
-               BUG_ON(atomic_long_read(&ei->i_sectors_dirty_count));
-               BUG_ON(atomic64_read(&ei->i_sectors) != inode->i_blocks);
-       }
+       BUG_ON(!is_bad_inode(&inode->v) && inode->ei_quota_reserved);
 
-       clear_inode(inode);
-
-       if (!inode->i_nlink && !is_bad_inode(inode)) {
-               bch2_inode_rm(c, inode->i_ino);
-               atomic_long_dec(&c->nr_inodes);
+       if (!inode->v.i_nlink && !is_bad_inode(&inode->v)) {
+               bch2_quota_acct(c, inode->ei_qid, Q_SPC, -((s64) inode->v.i_blocks),
+                               KEY_TYPE_QUOTA_WARN);
+               bch2_quota_acct(c, inode->ei_qid, Q_INO, -1,
+                               KEY_TYPE_QUOTA_WARN);
+               bch2_inode_rm(c, inode->v.i_ino, true);
        }
 }
 
@@ -1152,21 +1251,29 @@ static int bch2_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
        struct super_block *sb = dentry->d_sb;
        struct bch_fs *c = sb->s_fs_info;
+       struct bch_fs_usage_short usage = bch2_fs_usage_read_short(c);
+       unsigned shift = sb->s_blocksize_bits - 9;
+       /*
+        * this assumes inodes take up 64 bytes, which is a decent average
+        * number:
+        */
+       u64 avail_inodes = ((usage.capacity - usage.used) << 3);
        u64 fsid;
 
-       buf->f_type     = BCACHE_STATFS_MAGIC;
+       buf->f_type     = BCACHEFS_STATFS_MAGIC;
        buf->f_bsize    = sb->s_blocksize;
-       buf->f_blocks   = c->capacity >> PAGE_SECTOR_SHIFT;
-       buf->f_bfree    = (c->capacity - bch2_fs_sectors_used(c)) >> PAGE_SECTOR_SHIFT;
+       buf->f_blocks   = usage.capacity >> shift;
+       buf->f_bfree    = (usage.capacity - usage.used) >> shift;
        buf->f_bavail   = buf->f_bfree;
-       buf->f_files    = atomic_long_read(&c->nr_inodes);
-       buf->f_ffree    = U64_MAX;
+
+       buf->f_files    = usage.nr_inodes + avail_inodes;
+       buf->f_ffree    = avail_inodes;
 
        fsid = le64_to_cpup((void *) c->sb.user_uuid.b) ^
               le64_to_cpup((void *) c->sb.user_uuid.b + sizeof(u64));
        buf->f_fsid.val[0] = fsid & 0xFFFFFFFFUL;
        buf->f_fsid.val[1] = (fsid >> 32) & 0xFFFFFFFFUL;
-       buf->f_namelen  = NAME_MAX;
+       buf->f_namelen  = BCH_NAME_MAX;
 
        return 0;
 }
@@ -1175,6 +1282,9 @@ static int bch2_sync_fs(struct super_block *sb, int wait)
 {
        struct bch_fs *c = sb->s_fs_info;
 
+       if (c->opts.journal_flush_disabled)
+               return 0;
+
        if (!wait) {
                bch2_journal_flush_async(&c->journal, NULL);
                return 0;
@@ -1183,13 +1293,25 @@ static int bch2_sync_fs(struct super_block *sb, int wait)
        return bch2_journal_flush(&c->journal);
 }
 
-static struct bch_fs *bch2_open_as_blockdevs(const char *_dev_name,
-                                            struct bch_opts opts)
+static struct bch_fs *bch2_path_to_fs(const char *dev)
 {
-       size_t nr_devs = 0, i = 0;
-       char *dev_name, *s, **devs;
-       struct bch_fs *c = NULL;
-       const char *err = "cannot allocate memory";
+       struct bch_fs *c;
+       struct block_device *bdev = lookup_bdev(dev);
+
+       if (IS_ERR(bdev))
+               return ERR_CAST(bdev);
+
+       c = bch2_bdev_to_fs(bdev);
+       bdput(bdev);
+       if (c)
+               closure_put(&c->cl);
+       return c ?: ERR_PTR(-ENOENT);
+}
+
+static char **split_devs(const char *_dev_name, unsigned *nr)
+{
+       char *dev_name = NULL, **devs = NULL, *s;
+       size_t i, nr_devs = 0;
 
        dev_name = kstrdup(_dev_name, GFP_KERNEL);
        if (!dev_name)
@@ -1198,67 +1320,19 @@ static struct bch_fs *bch2_open_as_blockdevs(const char *_dev_name,
        for (s = dev_name; s; s = strchr(s + 1, ':'))
                nr_devs++;
 
-       devs = kcalloc(nr_devs, sizeof(const char *), GFP_KERNEL);
-       if (!devs)
-               goto err;
+       devs = kcalloc(nr_devs + 1, sizeof(const char *), GFP_KERNEL);
+       if (!devs) {
+               kfree(dev_name);
+               return NULL;
+       }
 
        for (i = 0, s = dev_name;
             s;
             (s = strchr(s, ':')) && (*s++ = '\0'))
                devs[i++] = s;
 
-       err = bch2_fs_open(devs, nr_devs, opts, &c);
-       if (err) {
-               /*
-                * Already open?
-                * Look up each block device, make sure they all belong to a
-                * filesystem and they all belong to the _same_ filesystem
-                */
-
-               for (i = 0; i < nr_devs; i++) {
-                       struct block_device *bdev = lookup_bdev(devs[i]);
-                       struct bch_fs *c2;
-
-                       if (IS_ERR(bdev))
-                               goto err;
-
-                       c2 = bch2_bdev_to_fs(bdev);
-                       bdput(bdev);
-
-                       if (!c)
-                               c = c2;
-                       else if (c2)
-                               closure_put(&c2->cl);
-
-                       if (!c)
-                               goto err;
-                       if (c != c2) {
-                               closure_put(&c->cl);
-                               goto err;
-                       }
-               }
-
-               mutex_lock(&c->state_lock);
-
-               if (!bch2_fs_running(c)) {
-                       mutex_unlock(&c->state_lock);
-                       closure_put(&c->cl);
-                       err = "incomplete filesystem";
-                       c = NULL;
-                       goto err;
-               }
-
-               mutex_unlock(&c->state_lock);
-       }
-
-       set_bit(BCH_FS_BDEV_MOUNTED, &c->flags);
-err:
-       kfree(devs);
-       kfree(dev_name);
-
-       if (!c)
-               pr_err("bch_fs_open err %s", err);
-       return c;
+       *nr = nr_devs;
+       return devs;
 }
 
 static int bch2_remount(struct super_block *sb, int *flags, char *data)
@@ -1267,31 +1341,33 @@ static int bch2_remount(struct super_block *sb, int *flags, char *data)
        struct bch_opts opts = bch2_opts_empty();
        int ret;
 
-       opts.read_only = (*flags & MS_RDONLY) != 0;
+       opt_set(opts, read_only, (*flags & SB_RDONLY) != 0);
 
-       ret = bch2_parse_mount_opts(&opts, data);
+       ret = bch2_parse_mount_opts(c, &opts, data);
        if (ret)
                return ret;
 
-       if (opts.read_only >= 0 &&
-           opts.read_only != c->opts.read_only) {
-               const char *err = NULL;
+       if (opts.read_only != c->opts.read_only) {
+               down_write(&c->state_lock);
 
                if (opts.read_only) {
                        bch2_fs_read_only(c);
 
-                       sb->s_flags |= MS_RDONLY;
+                       sb->s_flags |= SB_RDONLY;
                } else {
-                       err = bch2_fs_read_write(c);
-                       if (err) {
-                               bch_err(c, "error going rw: %s", err);
+                       ret = bch2_fs_read_write(c);
+                       if (ret) {
+                               bch_err(c, "error going rw: %i", ret);
+                               up_write(&c->state_lock);
                                return -EINVAL;
                        }
 
-                       sb->s_flags &= ~MS_RDONLY;
+                       sb->s_flags &= ~SB_RDONLY;
                }
 
                c->opts.read_only = opts.read_only;
+
+               up_write(&c->state_lock);
        }
 
        if (opts.errors >= 0)
@@ -1300,6 +1376,56 @@ static int bch2_remount(struct super_block *sb, int *flags, char *data)
        return ret;
 }
 
+static int bch2_show_devname(struct seq_file *seq, struct dentry *root)
+{
+       struct bch_fs *c = root->d_sb->s_fs_info;
+       struct bch_dev *ca;
+       unsigned i;
+       bool first = true;
+
+       for_each_online_member(ca, c, i) {
+               if (!first)
+                       seq_putc(seq, ':');
+               first = false;
+               seq_puts(seq, "/dev/");
+               seq_puts(seq, ca->name);
+       }
+
+       return 0;
+}
+
+static int bch2_show_options(struct seq_file *seq, struct dentry *root)
+{
+       struct bch_fs *c = root->d_sb->s_fs_info;
+       enum bch_opt_id i;
+       char buf[512];
+
+       for (i = 0; i < bch2_opts_nr; i++) {
+               const struct bch_option *opt = &bch2_opt_table[i];
+               u64 v = bch2_opt_get_by_id(&c->opts, i);
+
+               if (!(opt->mode & OPT_MOUNT))
+                       continue;
+
+               if (v == bch2_opt_get_by_id(&bch2_opts_default, i))
+                       continue;
+
+               bch2_opt_to_text(&PBUF(buf), c, opt, v,
+                                OPT_SHOW_MOUNT_STYLE);
+               seq_putc(seq, ',');
+               seq_puts(seq, buf);
+       }
+
+       return 0;
+}
+
+static void bch2_put_super(struct super_block *sb)
+{
+       struct bch_fs *c = sb->s_fs_info;
+
+       __bch2_fs_stop(c);
+}
+
 static const struct super_operations bch_super_operations = {
        .alloc_inode    = bch2_alloc_inode,
        .destroy_inode  = bch2_destroy_inode,
@@ -1307,77 +1433,137 @@ static const struct super_operations bch_super_operations = {
        .evict_inode    = bch2_evict_inode,
        .sync_fs        = bch2_sync_fs,
        .statfs         = bch2_statfs,
-       .show_options   = generic_show_options,
+       .show_devname   = bch2_show_devname,
+       .show_options   = bch2_show_options,
        .remount_fs     = bch2_remount,
-#if 0
        .put_super      = bch2_put_super,
+#if 0
        .freeze_fs      = bch2_freeze,
        .unfreeze_fs    = bch2_unfreeze,
 #endif
 };
 
-static int bch2_test_super(struct super_block *s, void *data)
-{
-       return s->s_fs_info == data;
-}
-
 static int bch2_set_super(struct super_block *s, void *data)
 {
        s->s_fs_info = data;
        return 0;
 }
 
+static int bch2_noset_super(struct super_block *s, void *data)
+{
+       return -EBUSY;
+}
+
+static int bch2_test_super(struct super_block *s, void *data)
+{
+       struct bch_fs *c = s->s_fs_info;
+       struct bch_fs **devs = data;
+       unsigned i;
+
+       if (!c)
+               return false;
+
+       for (i = 0; devs[i]; i++)
+               if (c != devs[i])
+                       return false;
+       return true;
+}
+
 static struct dentry *bch2_mount(struct file_system_type *fs_type,
                                 int flags, const char *dev_name, void *data)
 {
        struct bch_fs *c;
        struct bch_dev *ca;
        struct super_block *sb;
-       struct inode *inode;
+       struct inode *vinode;
        struct bch_opts opts = bch2_opts_empty();
-       unsigned i;
+       char **devs;
+       struct bch_fs **devs_to_fs = NULL;
+       unsigned i, nr_devs;
        int ret;
 
-       opts.read_only = (flags & MS_RDONLY) != 0;
+       opt_set(opts, read_only, (flags & SB_RDONLY) != 0);
 
-       ret = bch2_parse_mount_opts(&opts, data);
+       ret = bch2_parse_mount_opts(NULL, &opts, data);
        if (ret)
                return ERR_PTR(ret);
 
-       c = bch2_open_as_blockdevs(dev_name, opts);
-       if (!c)
-               return ERR_PTR(-ENOENT);
+       devs = split_devs(dev_name, &nr_devs);
+       if (!devs)
+               return ERR_PTR(-ENOMEM);
 
-       sb = sget(fs_type, bch2_test_super, bch2_set_super, flags|MS_NOSEC, c);
-       if (IS_ERR(sb)) {
-               closure_put(&c->cl);
-               return ERR_CAST(sb);
+       devs_to_fs = kcalloc(nr_devs + 1, sizeof(void *), GFP_KERNEL);
+       if (!devs_to_fs) {
+               sb = ERR_PTR(-ENOMEM);
+               goto got_sb;
        }
 
-       BUG_ON(sb->s_fs_info != c);
+       for (i = 0; i < nr_devs; i++)
+               devs_to_fs[i] = bch2_path_to_fs(devs[i]);
 
-       if (sb->s_root) {
-               closure_put(&c->cl);
+       sb = sget(fs_type, bch2_test_super, bch2_noset_super,
+                 flags|SB_NOSEC, devs_to_fs);
+       if (!IS_ERR(sb))
+               goto got_sb;
+
+       c = bch2_fs_open(devs, nr_devs, opts);
+       if (IS_ERR(c)) {
+               sb = ERR_CAST(c);
+               goto got_sb;
+       }
+
+       /* Some options can't be parsed until after the fs is started: */
+       ret = bch2_parse_mount_opts(c, &opts, data);
+       if (ret) {
+               bch2_fs_stop(c);
+               sb = ERR_PTR(ret);
+               goto got_sb;
+       }
+
+       bch2_opts_apply(&c->opts, opts);
 
-               if ((flags ^ sb->s_flags) & MS_RDONLY) {
+       sb = sget(fs_type, NULL, bch2_set_super, flags|SB_NOSEC, c);
+       if (IS_ERR(sb))
+               bch2_fs_stop(c);
+got_sb:
+       kfree(devs_to_fs);
+       kfree(devs[0]);
+       kfree(devs);
+
+       if (IS_ERR(sb))
+               return ERR_CAST(sb);
+
+       c = sb->s_fs_info;
+
+       if (sb->s_root) {
+               if ((flags ^ sb->s_flags) & SB_RDONLY) {
                        ret = -EBUSY;
                        goto err_put_super;
                }
                goto out;
        }
 
-       /* XXX: blocksize */
-       sb->s_blocksize         = PAGE_SIZE;
-       sb->s_blocksize_bits    = PAGE_SHIFT;
+       sb->s_blocksize         = block_bytes(c);
+       sb->s_blocksize_bits    = ilog2(block_bytes(c));
        sb->s_maxbytes          = MAX_LFS_FILESIZE;
        sb->s_op                = &bch_super_operations;
+       sb->s_export_op         = &bch_export_ops;
+#ifdef CONFIG_BCACHEFS_QUOTA
+       sb->s_qcop              = &bch2_quotactl_operations;
+       sb->s_quota_types       = QTYPE_MASK_USR|QTYPE_MASK_GRP|QTYPE_MASK_PRJ;
+#endif
        sb->s_xattr             = bch2_xattr_handlers;
-       sb->s_magic             = BCACHE_STATFS_MAGIC;
+       sb->s_magic             = BCACHEFS_STATFS_MAGIC;
        sb->s_time_gran         = c->sb.time_precision;
        c->vfs_sb               = sb;
-       sb->s_bdi               = &c->bdi;
        strlcpy(sb->s_id, c->name, sizeof(sb->s_id));
 
+       ret = super_setup_bdi(sb);
+       if (ret)
+               goto err_put_super;
+
+       sb->s_bdi->ra_pages             = VM_READAHEAD_PAGES;
+
        for_each_online_member(ca, c, i) {
                struct block_device *bdev = ca->disk_sb.bdev;
 
@@ -1388,24 +1574,27 @@ static struct dentry *bch2_mount(struct file_system_type *fs_type,
                break;
        }
 
-       if (opts.posix_acl < 0)
-               sb->s_flags     |= MS_POSIXACL;
-       else
-               sb->s_flags     |= opts.posix_acl ? MS_POSIXACL : 0;
+#ifdef CONFIG_BCACHEFS_POSIX_ACL
+       if (c->opts.acl)
+               sb->s_flags     |= SB_POSIXACL;
+#endif
 
-       inode = bch2_vfs_inode_get(sb, BCACHE_ROOT_INO);
-       if (IS_ERR(inode)) {
-               ret = PTR_ERR(inode);
+       vinode = bch2_vfs_inode_get(c, BCACHEFS_ROOT_INO);
+       if (IS_ERR(vinode)) {
+               bch_err(c, "error mounting: error getting root inode %i",
+                       (int) PTR_ERR(vinode));
+               ret = PTR_ERR(vinode);
                goto err_put_super;
        }
 
-       sb->s_root = d_make_root(inode);
+       sb->s_root = d_make_root(vinode);
        if (!sb->s_root) {
+               bch_err(c, "error mounting: error allocating root dentry");
                ret = -ENOMEM;
                goto err_put_super;
        }
 
-       sb->s_flags |= MS_ACTIVE;
+       sb->s_flags |= SB_ACTIVE;
 out:
        return dget(sb->s_root);
 
@@ -1419,11 +1608,7 @@ static void bch2_kill_sb(struct super_block *sb)
        struct bch_fs *c = sb->s_fs_info;
 
        generic_shutdown_super(sb);
-
-       if (test_bit(BCH_FS_BDEV_MOUNTED, &c->flags))
-               bch2_fs_stop(c);
-       else
-               closure_put(&c->cl);
+       bch2_fs_free(c);
 }
 
 static struct file_system_type bcache_fs_type = {
@@ -1439,12 +1624,6 @@ MODULE_ALIAS_FS("bcachefs");
 void bch2_vfs_exit(void)
 {
        unregister_filesystem(&bcache_fs_type);
-       if (bch2_dio_write_bioset)
-               bioset_free(bch2_dio_write_bioset);
-       if (bch2_dio_read_bioset)
-               bioset_free(bch2_dio_read_bioset);
-       if (bch2_writepage_bioset)
-               bioset_free(bch2_writepage_bioset);
        if (bch2_inode_cache)
                kmem_cache_destroy(bch2_inode_cache);
 }
@@ -1457,20 +1636,6 @@ int __init bch2_vfs_init(void)
        if (!bch2_inode_cache)
                goto err;
 
-       bch2_writepage_bioset =
-               bioset_create(4, offsetof(struct bch_writepage_io, op.op.wbio.bio));
-       if (!bch2_writepage_bioset)
-               goto err;
-
-       bch2_dio_read_bioset = bioset_create(4, offsetof(struct dio_read, rbio.bio));
-       if (!bch2_dio_read_bioset)
-               goto err;
-
-       bch2_dio_write_bioset =
-               bioset_create(4, offsetof(struct dio_write, iop.op.wbio.bio));
-       if (!bch2_dio_write_bioset)
-               goto err;
-
        ret = register_filesystem(&bcache_fs_type);
        if (ret)
                goto err;
@@ -1480,3 +1645,5 @@ err:
        bch2_vfs_exit();
        return ret;
 }
+
+#endif /* NO_BCACHEFS_FS */