Merge branch 'findmnt-Q' of https://github.com/masatake/util-linux

* 'findmnt-Q' of https://github.com/masatake/util-linux:
  tests: (findmnt) add a case testing -Q option
  findmnt: (man) write about -Q,--filter option
  findmnt: add -Q,--filter option
  findmnt: (refactor) convert add_column macro to a function
  findmnt: (refactor) add a helper function making an instance of libscols_table
  findmnt: (refactor) remove global variables shared between findmnt.c and fintmnt-verify.c

diff --cc misc-utils/findmnt-verify.c
index ecb51d9cfccb8721af658baa8f5e8b16a2d99dc3,ae8bf535e8942971a7702fe23d618c70f1b6790a..2a220dc5964f827744876ca39735ac0f3466cb2b
--- 1/misc-utils/findmnt-verify.c
--- 2/misc-utils/findmnt-verify.c
+++ b/misc-utils/findmnt-verify.c
@@@ -446,15 -448,15 +448,15 @@@ static int verify_fstype(struct verify_
        }
  
        errno = 0;
-       realtype = mnt_get_fstype(src, &ambi, cache);
+       realtype = mnt_get_fstype(src, &ambi, findmnt->cache);
  
        if (!realtype) {
 -              const char *reson = errno ? strerror(errno) : _("reason unknown");
 +              const char *reason = errno ? strerror(errno) : _("reason unknown");
  
                if (isauto)
 -                      verify_err(vfy, _("cannot detect on-disk filesystem type (%s)"), reson);
 +                      verify_err(vfy, _("cannot detect on-disk filesystem type (%s)"), reason);
                else
 -                      verify_warn(vfy, _("cannot detect on-disk filesystem type (%s)"), reson);
 +                      verify_warn(vfy, _("cannot detect on-disk filesystem type (%s)"), reason);
                goto done;
        }