summaryrefslogtreecommitdiffstats
path: root/libblkid
diff options
context:
space:
mode:
authorNikolay Borisov2019-05-13 14:44:17 +0200
committerKarel Zak2019-05-14 13:33:13 +0200
commit5de879b0f28574a1395e36a2b15b8fc6fd88ce35 (patch)
treee10aa92a01d1b1ae3b50213e8ce35d89f0024d73 /libblkid
parentlib/strutils: parse_size() fix frac digit calculation (diff)
downloadkernel-qcow2-util-linux-5de879b0f28574a1395e36a2b15b8fc6fd88ce35.tar.gz
kernel-qcow2-util-linux-5de879b0f28574a1395e36a2b15b8fc6fd88ce35.tar.xz
kernel-qcow2-util-linux-5de879b0f28574a1395e36a2b15b8fc6fd88ce35.zip
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 <nborisov@suse.com>
Diffstat (limited to 'libblkid')
-rw-r--r--libblkid/src/verify.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libblkid/src/verify.c b/libblkid/src/verify.c
index 7f44f5497..e630ab1a3 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