]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libblkid: Don't check BLKID_PROBE_INTERVAL in blkid_verify
authorNikolay Borisov <nborisov@suse.com>
Mon, 13 May 2019 12:44:17 +0000 (15:44 +0300)
committerKarel Zak <kzak@redhat.com>
Tue, 14 May 2019 11:33:13 +0000 (13:33 +0200)
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>
libblkid/src/verify.c

index 7f44f5497c8e87fbc0cf4d95b83126de8f65f81c..e630ab1a38c53f198e94c0ca81397b862a873c33 100644 (file)
@@ -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