mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 11:19:37 +00:00
Code Issues Releases Wiki Activity

bcachefs: Simplify bch2_write_inode_trans, fix lockdep splat

Browse source 
ei_update_lock isn't currently needed for write inode (but it will be
needed again when deferred btree updates are used for inode updates)

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2018-07-17 14:03:47 -04:00 committed by Kent Overstreet
parent af1c687181
commit 4e1ec2cc0d
2 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/bcachefs/fs-io.c
View file

@ -355,8 +355,6 @@ bchfs_extent_update_hook(struct extent_insert_hook *hook,
h->inode_u.bi_size = offset;
do_pack = true;
inode->ei_inode.bi_size = offset;
spin_lock(&inode->v.i_lock);
if (offset > inode->v.i_size) {
if (h->op->is_dio)
@ -478,6 +476,7 @@ static int bchfs_write_index_update(struct bch_write_op *wop)
&hook.hook, op_journal_seq(wop),
BTREE_INSERT_NOFAIL|
BTREE_INSERT_ATOMIC|
BTREE_INSERT_NOUNLOCK|
BTREE_INSERT_USE_RESERVE,
BTREE_INSERT_ENTRY(extent_iter, k));
}
@ -493,6 +492,9 @@ static int bchfs_write_index_update(struct bch_write_op *wop)
if (ret)
break;
if (hook.need_inode_update)
op->inode->ei_inode = hook.inode_u;
BUG_ON(bkey_cmp(extent_iter->pos, k->k.p) < 0);
bch2_keylist_pop_front(keys);
} while (!bch2_keylist_empty(keys));

33
fs/bcachefs/fs.c
View file

@ -157,35 +157,20 @@ int __must_check bch2_write_inode_trans(struct btree_trans *trans,
{
struct btree_iter *iter;
struct bkey_inode_buf *inode_p;
struct bkey_s_c k;
u64 inum = inode->v.i_ino;
int ret;
lockdep_assert_held(&inode->ei_update_lock);
iter = bch2_trans_get_iter(trans, BTREE_ID_INODES, POS(inum, 0),
BTREE_ITER_SLOTS|BTREE_ITER_INTENT);
iter = bch2_trans_get_iter(trans, BTREE_ID_INODES,
POS(inode->v.i_ino, 0),
BTREE_ITER_SLOTS|BTREE_ITER_INTENT);
if (IS_ERR(iter))
return PTR_ERR(iter);
k = bch2_btree_iter_peek_slot(iter);
if ((ret = btree_iter_err(k)))
/* The btree node lock is our lock on the inode: */
ret = bch2_btree_iter_traverse(iter);
if (ret)
return ret;
if (WARN_ONCE(k.k->type != BCH_INODE_FS,
"inode %llu not found when updating", inum))
return -ENOENT;
ret = bch2_inode_unpack(bkey_s_c_to_inode(k), inode_u);
if (WARN_ONCE(ret,
"error %i unpacking inode %llu", ret, inum))
return -ENOENT;
BUG_ON(inode_u->bi_size != inode->ei_inode.bi_size);
BUG_ON(inode_u->bi_size != inode->ei_inode.bi_size &&
!(inode_u->bi_flags & BCH_INODE_I_SIZE_DIRTY) &&
inode_u->bi_size > i_size_read(&inode->v));
*inode_u = inode->ei_inode;
if (set) {
ret = set(inode, inode_u, p);
@ -505,8 +490,6 @@ static int __bch2_link(struct bch_fs *c,
struct bch_inode_unpacked inode_u;
int ret;
lockdep_assert_held(&inode->v.i_rwsem);
bch2_trans_init(&trans, c);
retry:
bch2_trans_begin(&trans);
@ -543,6 +526,8 @@ static int bch2_link(struct dentry *old_dentry, struct inode *vdir,
struct bch_inode_info *inode = to_bch_ei(old_dentry->d_inode);
int ret;
lockdep_assert_held(&inode->v.i_rwsem);
ret = __bch2_link(c, inode, dir, dentry);
if (unlikely(ret))
return ret;