From 5de879b0f28574a1395e36a2b15b8fc6fd88ce35 Mon Sep 17 00:00:00 2001 From: Nikolay Borisov Date: Mon, 13 May 2019 15:44:17 +0300 Subject: [PATCH] libblkid: Don't check BLKID_PROBE_INTERVAL in blkid_verify That constant is set to 200 seconds and is already check in probe_all(). It essentially controls how often blkid_probe_all can do a full cache revalidation. Since blkid_verify is called from within probe_all() iff at least BLKID_PROBE_INTERVAL seconds have elapsed it makes no sense to check this value in blkid_verify. Signed-off-by: Nikolay Borisov --- libblkid/src/verify.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libblkid/src/verify.c b/libblkid/src/verify.c index 7f44f5497c..e630ab1a38 100644 --- a/libblkid/src/verify.c +++ b/libblkid/src/verify.c @@ -96,8 +96,7 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev) st.st_mtime <= dev->bid_time && #endif (diff < BLKID_PROBE_MIN || - (dev->bid_flags & BLKID_BID_FL_VERIFIED && - diff < BLKID_PROBE_INTERVAL))) + dev->bid_flags & BLKID_BID_FL_VERIFIED)) return dev; #ifndef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC -- 2.39.5