libmount: improve fs->stmnt_done mask use

It is possible that one field in the libmnt_fs struct requires
fetching multiple statmount fields using multiple STATMOUNT_* mask
items. This requires changes to the way the fs->stmnt_done mask is
used.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libmount/src/fs_statmount.c b/libmount/src/fs_statmount.c
index 8f05a45fd21667eab0164c86bc8cb7afd74118ea..c44e822995c3c8397d90983ee65c91445b31ff7b 100644 (file)
--- a/libmount/src/fs_statmount.c
+++ b/libmount/src/fs_statmount.c
@@ -305,10 +305,16 @@ int mnt_fs_fetch_statmount(struct libmnt_fs *fs, uint64_t mask)
        /* add default mask if on-demand enabled */
        if (fs->stmnt
            && !fs->stmnt->disabled
-           && fs->stmnt->mask
-           && !(fs->stmnt_done & fs->stmnt->mask))
+           && fs->stmnt->mask)
                mask |= fs->stmnt->mask;
 
+       /* call only for missing stuff */
+       if (mask && fs->stmnt_done) {
+               mask &= ~fs->stmnt_done;        /* remove what is already done */
+               if (!mask)
+                       return 0;
+       }
+
        /* ignore repeated requests */
        if (mask && fs->stmnt_done & mask)
                return 0;

diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index e2381e34314e5ad109a75c1a55f900d81be07586..94328460a11d50b788c388581cb0f13d006bfb60 100644 (file)
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -291,7 +291,7 @@ struct libmnt_fs {
                        if (!(FS)->MEMBER                                       \
                            && (FS)->stmnt                                      \
                            && !(FS)->stmnt->disabled                           \
-                           && !((FS)->stmnt_done & (FLAGS)))                   \
+                           && ((FLAGS) & ~((FS)->stmnt_done)))                 \
                                mnt_fs_fetch_statmount((FS), (FLAGS)); })
 #endif