diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-07-16 03:58:54 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-07-16 04:00:44 -0400 |
| commit | 76a549d82d1383c02e4aa6f7d9eda2df9f2196b3 (patch) | |
| tree | 99dd635807dd308586ed45677b90140e3ab60599 /libbcachefs/fs-ioctl.c | |
| parent | 75c7148e0aff2184c75a52e7c4c58e46e715757b (diff) | |
Update bcachefs sources to eab3b355cf bcachefs: trace transaction restarts
Diffstat (limited to 'libbcachefs/fs-ioctl.c')
| -rw-r--r-- | libbcachefs/fs-ioctl.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/libbcachefs/fs-ioctl.c b/libbcachefs/fs-ioctl.c index 2c1ecf7..336dbd4 100644 --- a/libbcachefs/fs-ioctl.c +++ b/libbcachefs/fs-ioctl.c @@ -87,6 +87,8 @@ void bch2_inode_flags_to_vfs(struct bch_inode_info *inode) struct flags_set { unsigned mask; unsigned flags; + + unsigned projid; }; static int bch2_inode_flags_set(struct bch_inode_info *inode, @@ -150,7 +152,7 @@ static int bch2_ioc_setflags(struct bch_fs *c, } mutex_lock(&inode->ei_update_lock); - ret = __bch2_write_inode(c, inode, bch2_inode_flags_set, &s); + ret = __bch2_write_inode(c, inode, bch2_inode_flags_set, &s, 0); if (!ret) bch2_inode_flags_to_vfs(inode); @@ -185,9 +187,9 @@ static int bch2_set_projid(struct bch_fs *c, qid.q[QTYP_PRJ] = projid; - ret = bch2_quota_transfer(c, 1 << QTYP_PRJ, qid, inode->ei_qid, - inode->v.i_blocks + - inode->ei_quota_reserved); + return bch2_quota_transfer(c, 1 << QTYP_PRJ, qid, inode->ei_qid, + inode->v.i_blocks + + inode->ei_quota_reserved); if (ret) return ret; @@ -195,6 +197,17 @@ static int bch2_set_projid(struct bch_fs *c, return 0; } +static int fssetxattr_inode_update_fn(struct bch_inode_info *inode, + struct bch_inode_unpacked *bi, + void *p) +{ + struct flags_set *s = p; + + bi->bi_project = s->projid; + + return bch2_inode_flags_set(inode, bi, p); +} + static int bch2_ioc_fssetxattr(struct bch_fs *c, struct file *file, struct bch_inode_info *inode, @@ -211,6 +224,8 @@ static int bch2_ioc_fssetxattr(struct bch_fs *c, if (fa.fsx_xflags) return -EOPNOTSUPP; + s.projid = fa.fsx_projid; + ret = mnt_want_write_file(file); if (ret) return ret; @@ -226,7 +241,7 @@ static int bch2_ioc_fssetxattr(struct bch_fs *c, if (ret) goto err_unlock; - ret = __bch2_write_inode(c, inode, bch2_inode_flags_set, &s); + ret = __bch2_write_inode(c, inode, fssetxattr_inode_update_fn, &s, 0); if (!ret) bch2_inode_flags_to_vfs(inode); err_unlock: |