]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/4.2.7/staging-lustre-use-jiffies-for-lp_last_query-times.patch
Drop watchdog patch
[thirdparty/kernel/stable-queue.git] / releases / 4.2.7 / staging-lustre-use-jiffies-for-lp_last_query-times.patch
1 From 9f088dba3cc267ea11ec0da318cd0175575b5f9b Mon Sep 17 00:00:00 2001
2 From: Arnd Bergmann <arnd@arndb.de>
3 Date: Sun, 27 Sep 2015 16:45:01 -0400
4 Subject: staging/lustre: use jiffies for lp_last_query times
5
6 From: Arnd Bergmann <arnd@arndb.de>
7
8 commit 9f088dba3cc267ea11ec0da318cd0175575b5f9b upstream.
9
10 The recently introduced lnet_peer_set_alive() function uses
11 get_seconds() to read the current time into a shared variable,
12 but all other uses of that variable compare it to jiffies values.
13
14 This changes the current use to jiffies as well for consistency.
15
16 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
17 Fixes: af3fa7c71bf ("staging/lustre/lnet: peer aliveness status and NI status")
18 Cc: Liang Zhen <liang.zhen@intel.com>
19 Cc: James Simmons <uja.ornl@gmail.com>
20 Cc: Isaac Huang <he.huang@intel.com>
21 Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
22 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
23
24 ---
25 drivers/staging/lustre/include/linux/lnet/lib-lnet.h | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28 --- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
29 +++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
30 @@ -680,7 +680,7 @@ void lnet_debug_peer(lnet_nid_t nid);
31 static inline void
32 lnet_peer_set_alive(lnet_peer_t *lp)
33 {
34 - lp->lp_last_alive = lp->lp_last_query = get_seconds();
35 + lp->lp_last_alive = lp->lp_last_query = jiffies;
36 if (!lp->lp_alive)
37 lnet_notify_locked(lp, 0, 1, lp->lp_last_alive);
38 }