diff options
author | Allen Pais <allen.lkml@gmail.com> | 2018-06-12 07:48:25 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-08-06 07:12:29 -0400 |
commit | a944442c2b8a420301e7830f976bab8cc86a2b4d (patch) | |
tree | f8150413f77e09eab7d76e94b739b9c3bcd56a34 /fs/btrfs/dev-replace.c | |
parent | 1ffaddd029c867d134a1dde39f540dcc8c52e274 (diff) |
btrfs: replace get_seconds with new 64bit time API
The get_seconds() function is deprecated as it truncates the timestamp
to 32 bits. Change it to or ktime_get_real_seconds().
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ update changelog ]
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
-rw-r--r-- | fs/btrfs/dev-replace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index e2ba0419297a..1b30c38d05c9 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
@@ -465,7 +465,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, | |||
465 | * go to the tgtdev as well (refer to btrfs_map_block()). | 465 | * go to the tgtdev as well (refer to btrfs_map_block()). |
466 | */ | 466 | */ |
467 | dev_replace->replace_state = BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED; | 467 | dev_replace->replace_state = BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED; |
468 | dev_replace->time_started = get_seconds(); | 468 | dev_replace->time_started = ktime_get_real_seconds(); |
469 | dev_replace->cursor_left = 0; | 469 | dev_replace->cursor_left = 0; |
470 | dev_replace->committed_cursor_left = 0; | 470 | dev_replace->committed_cursor_left = 0; |
471 | dev_replace->cursor_left_last_write_of_item = 0; | 471 | dev_replace->cursor_left_last_write_of_item = 0; |
@@ -618,7 +618,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, | |||
618 | : BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED; | 618 | : BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED; |
619 | dev_replace->tgtdev = NULL; | 619 | dev_replace->tgtdev = NULL; |
620 | dev_replace->srcdev = NULL; | 620 | dev_replace->srcdev = NULL; |
621 | dev_replace->time_stopped = get_seconds(); | 621 | dev_replace->time_stopped = ktime_get_real_seconds(); |
622 | dev_replace->item_needs_writeback = 1; | 622 | dev_replace->item_needs_writeback = 1; |
623 | 623 | ||
624 | /* replace old device with new one in mapping tree */ | 624 | /* replace old device with new one in mapping tree */ |
@@ -807,7 +807,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info) | |||
807 | break; | 807 | break; |
808 | } | 808 | } |
809 | dev_replace->replace_state = BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED; | 809 | dev_replace->replace_state = BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED; |
810 | dev_replace->time_stopped = get_seconds(); | 810 | dev_replace->time_stopped = ktime_get_real_seconds(); |
811 | dev_replace->item_needs_writeback = 1; | 811 | dev_replace->item_needs_writeback = 1; |
812 | btrfs_dev_replace_write_unlock(dev_replace); | 812 | btrfs_dev_replace_write_unlock(dev_replace); |
813 | btrfs_scrub_cancel(fs_info); | 813 | btrfs_scrub_cancel(fs_info); |
@@ -848,7 +848,7 @@ void btrfs_dev_replace_suspend_for_unmount(struct btrfs_fs_info *fs_info) | |||
848 | case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED: | 848 | case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED: |
849 | dev_replace->replace_state = | 849 | dev_replace->replace_state = |
850 | BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED; | 850 | BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED; |
851 | dev_replace->time_stopped = get_seconds(); | 851 | dev_replace->time_stopped = ktime_get_real_seconds(); |
852 | dev_replace->item_needs_writeback = 1; | 852 | dev_replace->item_needs_writeback = 1; |
853 | btrfs_info(fs_info, "suspending dev_replace for unmount"); | 853 | btrfs_info(fs_info, "suspending dev_replace for unmount"); |
854 | break; | 854 | break; |