Skip to content

Commit

Permalink
btrfs: move commit out of sysfs when changing features
Browse files Browse the repository at this point in the history
Signed-off-by: David Sterba <dsterba@suse.cz>
  • Loading branch information
David Sterba committed Nov 12, 2014
1 parent d51033d commit 0eae274
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions fs/btrfs/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -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;
}
Expand Down

0 comments on commit 0eae274

Please sign in to comment.