Commit b3f255ef authored by Arnd Bergmann's avatar Arnd Bergmann Committed by J. Bruce Fields

nfsd: use ktime_get_seconds() for timestamps

The delegation logic in nfsd uses the somewhat inefficient
seconds_since_boot() function to record time intervals.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent fc1b2065
...@@ -854,7 +854,7 @@ static void nfs4_free_deleg(struct nfs4_stid *stid) ...@@ -854,7 +854,7 @@ static void nfs4_free_deleg(struct nfs4_stid *stid)
static DEFINE_SPINLOCK(blocked_delegations_lock); static DEFINE_SPINLOCK(blocked_delegations_lock);
static struct bloom_pair { static struct bloom_pair {
int entries, old_entries; int entries, old_entries;
time_t swap_time; time64_t swap_time;
int new; /* index into 'set' */ int new; /* index into 'set' */
DECLARE_BITMAP(set[2], 256); DECLARE_BITMAP(set[2], 256);
} blocked_delegations; } blocked_delegations;
...@@ -866,15 +866,15 @@ static int delegation_blocked(struct knfsd_fh *fh) ...@@ -866,15 +866,15 @@ static int delegation_blocked(struct knfsd_fh *fh)
if (bd->entries == 0) if (bd->entries == 0)
return 0; return 0;
if (seconds_since_boot() - bd->swap_time > 30) { if (ktime_get_seconds() - bd->swap_time > 30) {
spin_lock(&blocked_delegations_lock); spin_lock(&blocked_delegations_lock);
if (seconds_since_boot() - bd->swap_time > 30) { if (ktime_get_seconds() - bd->swap_time > 30) {
bd->entries -= bd->old_entries; bd->entries -= bd->old_entries;
bd->old_entries = bd->entries; bd->old_entries = bd->entries;
memset(bd->set[bd->new], 0, memset(bd->set[bd->new], 0,
sizeof(bd->set[0])); sizeof(bd->set[0]));
bd->new = 1-bd->new; bd->new = 1-bd->new;
bd->swap_time = seconds_since_boot(); bd->swap_time = ktime_get_seconds();
} }
spin_unlock(&blocked_delegations_lock); spin_unlock(&blocked_delegations_lock);
} }
...@@ -904,7 +904,7 @@ static void block_delegations(struct knfsd_fh *fh) ...@@ -904,7 +904,7 @@ static void block_delegations(struct knfsd_fh *fh)
__set_bit((hash>>8)&255, bd->set[bd->new]); __set_bit((hash>>8)&255, bd->set[bd->new]);
__set_bit((hash>>16)&255, bd->set[bd->new]); __set_bit((hash>>16)&255, bd->set[bd->new]);
if (bd->entries == 0) if (bd->entries == 0)
bd->swap_time = seconds_since_boot(); bd->swap_time = ktime_get_seconds();
bd->entries += 1; bd->entries += 1;
spin_unlock(&blocked_delegations_lock); spin_unlock(&blocked_delegations_lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment