diff options
author | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:33 +0100 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:33 +0100 |
commit | f004fae0cfeb96d33240eb5471f14cb6fbbd4eea (patch) | |
tree | 8a0cc3be4e031298ef1f6db573c5f57da333737e /fs/btrfs/root-tree.c | |
parent | 675d276b322b45e7bf7c616a2847bdc425745b99 (diff) | |
parent | f827ba9a641b481f01d1bdc0771a7afc3776cc0b (diff) |
Merge branch 'cleanups-4.6' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/root-tree.c')
-rw-r--r-- | fs/btrfs/root-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index 7cf8509deda7..a25f3b21491b 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -488,7 +488,7 @@ void btrfs_update_root_times(struct btrfs_trans_handle *trans, struct btrfs_root *root) { struct btrfs_root_item *item = &root->root_item; - struct timespec ct = CURRENT_TIME; + struct timespec ct = current_fs_time(root->fs_info->sb); spin_lock(&root->root_item_lock); btrfs_set_root_ctransid(item, trans->transid); |