diff options
| author | David Sterba | 2014-11-12 14:22:21 +0100 |
|---|---|---|
| committer | David Sterba | 2014-11-12 16:53:14 +0100 |
| commit | 0eae2747ec1ddcef5018827bce8f7d33b7d920e1 (patch) | |
| tree | d2821666e147b9a6ed9e8109f57147b3c9139fce /fs/btrfs/sysfs.c | |
| parent | btrfs: introduce pending action: commit (diff) | |
| download | kernel-qcow2-linux-0eae2747ec1ddcef5018827bce8f7d33b7d920e1.tar.gz kernel-qcow2-linux-0eae2747ec1ddcef5018827bce8f7d33b7d920e1.tar.xz kernel-qcow2-linux-0eae2747ec1ddcef5018827bce8f7d33b7d920e1.zip | |
btrfs: move commit out of sysfs when changing features
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/sysfs.c')
| -rw-r--r-- | fs/btrfs/sysfs.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index b2e7bb4393f6..226f7261533a 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -111,7 +111,6 @@ static ssize_t btrfs_feature_attr_store(struct kobject *kobj, { struct btrfs_fs_info *fs_info; struct btrfs_feature_attr *fa = to_btrfs_feature_attr(a); - struct btrfs_trans_handle *trans; u64 features, set, clear; unsigned long val; int ret; @@ -153,10 +152,6 @@ static ssize_t btrfs_feature_attr_store(struct kobject *kobj, btrfs_info(fs_info, "%s %s feature flag", val ? "Setting" : "Clearing", fa->kobj_attr.attr.name); - trans = btrfs_start_transaction(fs_info->fs_root, 0); - if (IS_ERR(trans)) - return PTR_ERR(trans); - spin_lock(&fs_info->super_lock); features = get_features(fs_info, fa->feature_set); if (val) @@ -166,9 +161,11 @@ static ssize_t btrfs_feature_attr_store(struct kobject *kobj, set_features(fs_info, fa->feature_set, features); spin_unlock(&fs_info->super_lock); - ret = btrfs_commit_transaction(trans, fs_info->fs_root); - if (ret) - return ret; + /* + * We don't want to do full transaction commit from inside sysfs + */ + btrfs_set_pending(fs_info, COMMIT); + wake_up_process(fs_info->transaction_kthread); return count; } |