diff options
| author | Chris Mason <clm@fb.com> | 2016-03-01 19:13:56 +0300 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-03-01 19:13:56 +0300 |
| commit | c05c5ee5ea40fe40df5e29471f583a0eb7c531e3 (patch) | |
| tree | c56a3336bf631d9e97f038f1253e8e99726eb3e5 /fs/btrfs/root-tree.c | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
| parent | f5bc27c71a1b0741cb93dbec0f216b012b21d93f (diff) | |
| download | linux-c05c5ee5ea40fe40df5e29471f583a0eb7c531e3.tar.xz | |
Merge tag 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.6
Btrfs patchsets for 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); |