diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-07-02 14:14:36 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-05-06 17:14:16 -0400 |
| commit | 3f78d3e2c442b54ad60d0f1c507f21144ea0a277 (patch) | |
| tree | 1afb0bd03e8332bf4a68d449ce1ba446d9fd7fc1 /fs/bcachefs/fs.c | |
| parent | ea5715a73506eb929e43b66eb3b87c94e2b44ab4 (diff) | |
Merge with ebc9749562 bcachefs: Fix for building with old gcc
Diffstat (limited to 'fs/bcachefs/fs.c')
| -rw-r--r-- | fs/bcachefs/fs.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c index c70c723f8518..9ce72815d1c8 100644 --- a/fs/bcachefs/fs.c +++ b/fs/bcachefs/fs.c @@ -594,7 +594,7 @@ static int bch2_unlink(struct inode *vdir, struct dentry *dentry) struct btree_trans trans; int ret; - bch2_lock_inodes(dir, inode); + bch2_lock_inodes(INODE_UPDATE_LOCK, dir, inode); bch2_trans_init(&trans, c, 4, 1024); retry: bch2_trans_begin(&trans); @@ -627,7 +627,7 @@ retry: ATTR_MTIME); err: bch2_trans_exit(&trans); - bch2_unlock_inodes(dir, inode); + bch2_unlock_inodes(INODE_UPDATE_LOCK, dir, inode); return ret; } @@ -804,7 +804,8 @@ static int bch2_rename2(struct inode *src_vdir, struct dentry *src_dentry, bch2_trans_init(&trans, c, 8, 2048); - bch2_lock_inodes(i.src_dir, + bch2_lock_inodes(INODE_UPDATE_LOCK, + i.src_dir, i.dst_dir, i.src_inode, i.dst_inode); @@ -902,7 +903,8 @@ err: 1 << QTYP_PRJ, KEY_TYPE_QUOTA_NOCHECK); - bch2_unlock_inodes(i.src_dir, + bch2_unlock_inodes(INODE_UPDATE_LOCK, + i.src_dir, i.dst_dir, i.src_inode, i.dst_inode); |