diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-23 23:11:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-24 00:41:27 +0100 |
| commit | 16ae1f223601c44e5cb65c99257ffae003504704 (patch) | |
| tree | 1f5284c0e82e4d94ca07eb022fa7911d99bb0cb6 /fs/afs/server.c | |
| parent | qedf: fix wrong le16 conversion (diff) | |
| parent | Merge tag 'sound-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
| download | linux-16ae1f223601c44e5cb65c99257ffae003504704.tar.xz linux-16ae1f223601c44e5cb65c99257ffae003504704.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/genet/bcmmii.c
drivers/net/hyperv/netvsc.c
kernel/bpf/hashtab.c
Almost entirely overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/afs/server.c')
| -rw-r--r-- | fs/afs/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/afs/server.c b/fs/afs/server.c index d4066ab7dd55..c001b1f2455f 100644 --- a/fs/afs/server.c +++ b/fs/afs/server.c @@ -242,7 +242,7 @@ void afs_put_server(struct afs_server *server) spin_lock(&afs_server_graveyard_lock); if (atomic_read(&server->usage) == 0) { list_move_tail(&server->grave, &afs_server_graveyard); - server->time_of_death = get_seconds(); + server->time_of_death = ktime_get_real_seconds(); queue_delayed_work(afs_wq, &afs_server_reaper, afs_server_timeout * HZ); } @@ -277,9 +277,9 @@ static void afs_reap_server(struct work_struct *work) LIST_HEAD(corpses); struct afs_server *server; unsigned long delay, expiry; - time_t now; + time64_t now; - now = get_seconds(); + now = ktime_get_real_seconds(); spin_lock(&afs_server_graveyard_lock); while (!list_empty(&afs_server_graveyard)) { |