block: fix ubi?_? glob pattern

[project/fstools.git] / block.c

diff --git a/block.c b/block.c
index a6295a5..4d823e6 100644 (file)
--- a/block.c
+++ b/block.c
@@ -29,6 +29,8 @@
 #include <sys/mount.h>
 #include <sys/wait.h>
 
 #include <sys/mount.h>
 #include <sys/wait.h>
 

+#include <linux/fs.h>
+

 #include <uci.h>
 #include <uci_blob.h>
 
 #include <uci.h>
 #include <uci_blob.h>
 


@@ -147,18 +149,6 @@ struct mount_flag {
        int32_t flag;
 };
 
        int32_t flag;
 };
 

-#ifndef MS_DIRSYNC
-#      define MS_DIRSYNC               (1 << 7)
-#endif
-
-#ifndef MS_RELATIME
-#      define MS_RELATIME              (1 << 21)
-#endif
-
-#ifndef MS_STRICTATIME
-#      define MS_STRICTATIME   (1 << 24)
-#endif
-

 static const struct mount_flag mount_flags[] = {
        { "sync",               MS_SYNCHRONOUS  },
        { "async",              ~MS_SYNCHRONOUS },
 static const struct mount_flag mount_flags[] = {
        { "sync",               MS_SYNCHRONOUS  },
        { "async",              ~MS_SYNCHRONOUS },


@@ -180,6 +170,10 @@ static const struct mount_flag mount_flags[] = {
        { "relatime",           MS_RELATIME     },
        { "norelatime",         ~MS_RELATIME    },
        { "strictatime",        MS_STRICTATIME  },
        { "relatime",           MS_RELATIME     },
        { "norelatime",         ~MS_RELATIME    },
        { "strictatime",        MS_STRICTATIME  },

+       { "acl",                MS_POSIXACL     },
+       { "noacl",              ~MS_POSIXACL    },
+       { "nouser_xattr",       MS_NOUSER       },
+       { "user_xattr",         ~MS_NOUSER      },

 };
 
 static char *blobmsg_get_strdup(struct blob_attr *attr)
 };
 
 static char *blobmsg_get_strdup(struct blob_attr *attr)


@@ -512,7 +506,7 @@ static void cache_load(int mtd)
        if (mtd) {
                _cache_load("/dev/mtdblock*");
                _cache_load("/dev/ubiblock*");
        if (mtd) {
                _cache_load("/dev/mtdblock*");
                _cache_load("/dev/ubiblock*");

-               _cache_load("/dev/ubi?*_?*");
+               _cache_load("/dev/ubi[0-9]*");

        }
        _cache_load("/dev/mmcblk*");
        _cache_load("/dev/sd*");
        }
        _cache_load("/dev/mmcblk*");
        _cache_load("/dev/sd*");