* [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 14:13 ` Miklos Szeredi
2017-12-14 6:47 ` [PATCH v2 02/18] fsck.overlay: fix uninitialized variable zhangyi (F)
` (17 subsequent siblings)
18 siblings, 1 reply; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
fsck.overlay
============
fsck.overlay is used to check and optionally repair underlying
directories of overlay-filesystem.
Check the following points:
Whiteouts
---------
A whiteout is a character device with 0/0 device number. It is used to
record the removed files or directories, When a whiteout is found in a
directory, there should be at least one directory or file with the same
name in any of the corresponding lower layers. If not exist, the whiteout
will be treated as orphan whiteout and remove.
Opaque directories
------------------
An opaque directory is a directory with "trusted.overlay.opaque" xattr
valued "y". There are two legal situations of making opaque directory: 1)
create directory over whiteout 2) creat directory in merged directory. If an
opaque directory is found, corresponding matching name in lower layers might
exist or parent directory might merged, If not, the opaque xattr will be
treated as invalid and remove.
Redirect directories
--------------------
An redirect directory is a directory with "trusted.overlay.redirect"
xattr valued to the path of the original location from the root of the
overlay. It is only used when renaming a directory and "redirect dir"
feature is enabled. If an redirect directory is found, the following
must be met:
1) The directory store in redirect xattr should exist in one of lower
layers.
2) The origin directory should be redirected only once in one layer,
which mean there is only one redirect xattr point to this origin directory in
the specified layer.
3) A whiteout or an opaque directory with the same name to origin should
exist in the same directory as the redirect directory.
If not, 1) The redirect xattr is invalid and need to remove 2) One of
the redirect xattr is redundant but not sure which one is, ask user 3)
Create a whiteout device or set opaque xattr to an existing directory if the
parent directory was meregd or remove xattr if not.
Usage
=====
1. Ensure overlay filesystem is not mounted based on directories which
need to check.
2. Run fsck.overlay program:
Usage:
fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
Options:
-l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
multiple lower use ':' as separator.
-u, --upperdir=UPPERDIR specify upper directory of overlayfs
-w, --workdir=WORKDIR specify work directory of overlayfs
-a, --auto repair automatically (no questions)
-v, --verbose print more messages of overlayfs
-h, --help display this usage of overlayfs
-V, --version display version information
3. Exit value:
0 No errors
1 Filesystem errors corrected
2 System should be rebooted
4 Filesystem errors left uncorrected
8 Operational error
16 Usage or syntax error
32 Checking canceled by user request
128 Shared-library error
Todo
====
1. Overlay filesystem mounted check. Prevent fscking when overlay is
online. Now, We cannot distinguish mounted directories if overlayfs was
mounted with relative path.
2. Symbolic link check.
3. Check origin/impure/nlink xattr.
4. ...
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
Makefile | 31 +++
README.md | 88 +++++++++
check.c | 482 ++++++++++++++++++++++++++++++++++++++++++++++
check.h | 7 +
common.c | 95 +++++++++
common.h | 34 ++++
config.h | 22 +++
fsck.c | 179 +++++++++++++++++
lib.c | 197 +++++++++++++++++++
lib.h | 73 +++++++
mount.c | 319 ++++++++++++++++++++++++++++++
mount.h | 8 +
test/README.md | 12 ++
test/auto_test.sh | 46 +++++
test/clean.sh | 6 +
test/local.config | 16 ++
test/src/opaque_test.sh | 144 ++++++++++++++
test/src/prepare.sh | 15 ++
test/src/redirect_test.sh | 163 ++++++++++++++++
test/src/whiteout_test.sh | 63 ++++++
20 files changed, 2000 insertions(+)
create mode 100644 Makefile
create mode 100644 README.md
create mode 100644 check.c
create mode 100644 check.h
create mode 100644 common.c
create mode 100644 common.h
create mode 100644 config.h
create mode 100644 fsck.c
create mode 100644 lib.c
create mode 100644 lib.h
create mode 100644 mount.c
create mode 100644 mount.h
create mode 100644 test/README.md
create mode 100755 test/auto_test.sh
create mode 100755 test/clean.sh
create mode 100644 test/local.config
create mode 100755 test/src/opaque_test.sh
create mode 100755 test/src/prepare.sh
create mode 100755 test/src/redirect_test.sh
create mode 100755 test/src/whiteout_test.sh
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ced5005
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,31 @@
+CFLAGS = -Wall -g
+LFLAGS = -lm
+CC = gcc
+
+all: overlay
+
+overlay: fsck.o common.o lib.o check.o mount.o
+ $(CC) $(LFLAGS) fsck.o common.o lib.o check.o mount.o -o fsck.overlay
+
+fsck.o:
+ $(CC) $(CFLAGS) -c fsck.c
+
+common.o:
+ $(CC) $(CFLAGS) -c common.c
+
+lib.o:
+ $(CC) $(CFLAGS) -c lib.c
+
+check.o:
+ $(CC) $(CFLAGS) -c check.c
+
+mount.o:
+ $(CC) $(CFLAGS) -c mount.c
+
+clean:
+ rm -f *.o fsck.overlay
+ rm -rf bin
+
+install: all
+ mkdir bin
+ cp fsck.overlay bin
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8de69cd
--- /dev/null
+++ b/README.md
@@ -0,0 +1,88 @@
+fsck.overlay
+============
+
+fsck.overlay is used to check and optionally repair underlying directories
+of overlay-filesystem.
+
+Check the following points:
+
+Whiteouts
+---------
+
+A whiteout is a character device with 0/0 device number. It is used to record
+the removed files or directories, When a whiteout is found in a directory,
+there should be at least one directory or file with the same name in any of the
+corresponding lower layers. If not exist, the whiteout will be treated as orphan
+whiteout and remove.
+
+
+Opaque directories
+------------------
+
+An opaque directory is a directory with "trusted.overlay.opaque" xattr valued
+"y". There are two legal situations of making opaque directory: 1) create
+directory over whiteout 2) creat directory in merged directory. If an opaque
+directory is found, corresponding matching name in lower layers might exist or
+parent directory might merged, If not, the opaque xattr will be treated as
+invalid and remove.
+
+
+Redirect directories
+--------------------
+
+An redirect directory is a directory with "trusted.overlay.redirect" xattr
+valued to the path of the original location from the root of the overlay. It
+is only used when renaming a directory and "redirect dir" feature is enabled.
+If an redirect directory is found, the following must be met:
+
+1) The directory store in redirect xattr should exist in one of lower layers.
+2) The origin directory should be redirected only once in one layer, which mean
+ there is only one redirect xattr point to this origin directory in the
+ specified layer.
+3) A whiteout or an opaque directory with the same name to origin should exist
+ in the same directory as the redirect directory.
+
+If not, 1) The redirect xattr is invalid and need to remove 2) One of the
+redirect xattr is redundant but not sure which one is, ask user 3) Create a
+whiteout device or set opaque xattr to an existing directory if the parent
+directory was meregd or remove xattr if not.
+
+Usage
+=====
+
+1. Ensure overlay filesystem is not mounted based on directories which need to
+ check.
+
+2. Run fsck.overlay program:
+ Usage:
+ fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
+
+ Options:
+ -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
+ multiple lower use ':' as separator.
+ -u, --upperdir=UPPERDIR specify upper directory of overlayfs
+ -w, --workdir=WORKDIR specify work directory of overlayfs
+ -a, --auto repair automatically (no questions)
+ -v, --verbose print more messages of overlayfs
+ -h, --help display this usage of overlayfs
+ -V, --version display version information
+
+3. Exit value:
+ 0 No errors
+ 1 Filesystem errors corrected
+ 2 System should be rebooted
+ 4 Filesystem errors left uncorrected
+ 8 Operational error
+ 16 Usage or syntax error
+ 32 Checking canceled by user request
+ 128 Shared-library error
+
+Todo
+====
+
+1. Overlay filesystem mounted check. Prevent fscking when overlay is
+ online. Now, We cannot distinguish mounted directories if overlayfs was
+ mounted with relative path.
+2. Symbolic link check.
+3. Check origin/impure/nlink xattr.
+4. ...
diff --git a/check.c b/check.c
new file mode 100644
index 0000000..1794501
--- /dev/null
+++ b/check.c
@@ -0,0 +1,482 @@
+/*
+ *
+ * Check and fix inconsistency for all underlying layers of overlay
+ *
+ * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <sys/types.h>
+#include <sys/xattr.h>
+#include <sys/stat.h>
+#include <linux/limits.h>
+
+#include "common.h"
+#include "lib.h"
+#include "check.h"
+
+/* Underlying information */
+struct ovl_lower_check {
+ unsigned int type; /* check extent type */
+
+ bool exist;
+ char path[PATH_MAX]; /* exist pathname found, only valid if exist */
+ struct stat st; /* only valid if exist */
+};
+
+/* Redirect information */
+struct ovl_redirect_entry {
+ struct ovl_redirect_entry *next;
+
+ char origin[PATH_MAX]; /* origin directory path */
+
+ char path[PATH_MAX]; /* redirect directory */
+ int dirtype; /* OVL_UPPER or OVL_LOWER */
+ int dirnum; /* only valid when dirtype==OVL_LOWER */
+};
+
+/* Whiteout */
+#define WHITEOUT_DEV 0
+#define WHITEOUT_MOD 0
+
+extern char **lowerdir;
+extern char upperdir[];
+extern char workdir[];
+extern unsigned int lower_num;
+extern int flags;
+extern int status;
+
+static inline mode_t file_type(const struct stat *status)
+{
+ return status->st_mode & S_IFMT;
+}
+
+static inline bool is_whiteout(const struct stat *status)
+{
+ return (file_type(status) == S_IFCHR) && (status->st_rdev == WHITEOUT_DEV);
+}
+
+static inline bool is_dir(const struct stat *status)
+{
+ return file_type(status) == S_IFDIR;
+}
+
+static bool is_dir_xattr(const char *pathname, const char *xattrname)
+{
+ char val;
+ ssize_t ret;
+
+ ret = getxattr(pathname, xattrname, &val, 1);
+ if ((ret < 0) && !(errno == ENODATA || errno == ENOTSUP)) {
+ print_err(_("Cannot getxattr %s %s: %s\n"), pathname,
+ xattrname, strerror(errno));
+ return false;
+ }
+
+ return (ret == 1 && val == 'y') ? true : false;
+}
+
+static inline bool ovl_is_opaque(const char *pathname)
+{
+ return is_dir_xattr(pathname, OVL_OPAQUE_XATTR);
+}
+
+static inline int ovl_remove_opaque(const char *pathname)
+{
+ return remove_xattr(pathname, OVL_OPAQUE_XATTR);
+}
+
+static inline int ovl_set_opaque(const char *pathname)
+{
+ return set_xattr(pathname, OVL_OPAQUE_XATTR, "y", 1);
+}
+
+static int ovl_get_redirect(const char *pathname, size_t dirlen,
+ size_t filelen, char **redirect)
+{
+ char *buf = NULL;
+ ssize_t ret;
+
+ ret = get_xattr(pathname, OVL_REDIRECT_XATTR, &buf, NULL);
+ if (ret <= 0 || !buf)
+ return ret;
+
+ if (buf[0] != '/') {
+ size_t baselen = strlen(pathname)-filelen-dirlen;
+
+ buf = srealloc(buf, ret + baselen + 1);
+ memmove(buf + baselen, buf, ret);
+ memcpy(buf, pathname+dirlen, baselen);
+ buf[ret + baselen] = '\0';
+ }
+
+ *redirect = buf;
+ return 0;
+}
+
+static inline int ovl_remove_redirect(const char *pathname)
+{
+ return remove_xattr(pathname, OVL_REDIRECT_XATTR);
+}
+
+static inline int ovl_create_whiteout(const char *pathname)
+{
+ int ret;
+
+ ret = mknod(pathname, S_IFCHR | WHITEOUT_MOD, makedev(0, 0));
+ if (ret)
+ print_err(_("Cannot mknod %s:%s\n"),
+ pathname, strerror(errno));
+ return ret;
+}
+
+/*
+ * Scan each lower dir lower than 'start' and check type matching,
+ * we stop scan if we found something.
+ *
+ * skip: skip whiteout.
+ *
+ */
+static int ovl_check_lower(const char *path, unsigned int start,
+ struct ovl_lower_check *chk, bool skip)
+{
+ char lower_path[PATH_MAX];
+ struct stat st;
+ unsigned int i;
+
+ for (i = start; i < lower_num; i++) {
+ snprintf(lower_path, sizeof(lower_path), "%s%s", lowerdir[i], path);
+
+ if (lstat(lower_path, &st) != 0) {
+ if (errno != ENOENT && errno != ENOTDIR) {
+ print_err(_("Cannot stat %s: %s\n"),
+ lower_path, strerror(errno));
+ return -1;
+ }
+ continue;
+ }
+
+ if (skip && is_whiteout(&st))
+ continue;
+
+ chk->exist = true;
+ chk->st = st;
+ strncpy(chk->path, lower_path, sizeof(chk->path));
+ break;
+ }
+
+ return 0;
+}
+
+/*
+ * Scan each underlying dirs under specified dir if a whiteout is
+ * found, check it's orphan or not. In auto-mode, orphan whiteouts
+ * will be removed directly.
+ */
+static int ovl_check_whiteout(struct scan_ctx *sctx)
+{
+ const char *pathname = sctx->pathname;
+ const struct stat *st = sctx->st;
+ struct ovl_lower_check chk = {0};
+ unsigned int start;
+ int ret = 0;
+
+ /* Is a whiteout ? */
+ if (!is_whiteout(st))
+ return 0;
+
+ /* Is Whiteout in the bottom lower dir ? */
+ if (sctx->dirtype == OVL_LOWER && sctx->num == lower_num-1)
+ goto remove;
+
+ /*
+ * Scan each corresponding lower directroy under this layer,
+ * check is there a file or dir with the same name.
+ */
+ start = (sctx->dirtype == OVL_LOWER) ? sctx->num + 1 : 0;
+ ret = ovl_check_lower(pathname + sctx->dirlen, start, &chk, true);
+ if (ret)
+ return ret;
+ if (chk.exist && !is_whiteout(&chk.st))
+ goto out;
+
+remove:
+ /* Remove orphan whiteout directly or ask user */
+ print_info(_("Orphan whiteout: %s "), pathname);
+ if (!ask_question("Remove", 1))
+ return 0;
+
+ ret = unlink(pathname);
+ if (ret) {
+ print_err(_("Cannot unlink %s: %s\n"), pathname,
+ strerror(errno));
+ return ret;
+ }
+out:
+ return ret;
+}
+
+/*
+ * Scan each underlying under specified dir if an opaque dir is found,
+ * check the opaque xattr is invalid or not. In auto-mode, invalid
+ * opaque xattr will be removed directly.
+ * Do the follow checking:
+ * 1) Check lower matching name exist or not.
+ * 2) Check parent dir is merged or pure.
+ * If no lower matching and parent is not merged, remove opaque xattr.
+ */
+static int ovl_check_opaque(struct scan_ctx *sctx)
+{
+ const char *pathname = sctx->pathname;
+ char parent_path[PATH_MAX];
+ struct ovl_lower_check chk = {0};
+ unsigned int start;
+ int ret = 0;
+
+ /* Is opaque ? */
+ if (!ovl_is_opaque(pathname))
+ goto out;
+
+ /* Opaque dir in last lower dir ? */
+ if (sctx->dirtype == OVL_LOWER && sctx->num == lower_num-1)
+ goto remove;
+
+ /*
+ * Scan each corresponding lower directroy under this layer,
+ * check if there is a file or dir with the same name.
+ */
+ start = (sctx->dirtype == OVL_LOWER) ? sctx->num + 1 : 0;
+ ret = ovl_check_lower(pathname + sctx->dirlen, start, &chk, true);
+ if (ret)
+ return ret;
+ if (chk.exist && !is_whiteout(&chk.st))
+ goto out;
+
+ /* Check parent directory merged or pure */
+ memcpy(parent_path, pathname, sctx->pathlen-sctx->filelen);
+ ret = ovl_check_lower(parent_path + sctx->dirlen, start, &chk, false);
+ if (ret)
+ return ret;
+ if (chk.exist && is_dir(&chk.st))
+ goto out;
+
+remove:
+ /* Remove opaque xattr or ask user */
+ print_info(_("Invalid opaque xattr: %s "), pathname);
+ if (!ask_question("Remove", 1))
+ return 0;
+
+ ret = ovl_remove_opaque(pathname);
+out:
+ return ret;
+}
+
+static struct ovl_redirect_entry *redirect_list = NULL;
+
+static void ovl_redirect_entry_add(const char *path, int dirtype,
+ int dirnum, const char *origin)
+{
+ struct ovl_redirect_entry *last, *new;
+
+ new = smalloc(sizeof(*new));
+
+ print_debug(_("Redirect entry add: [%s %s %s %d]\n"),
+ origin, path, (dirtype == OVL_UPPER) ? "UP" : "LOW",
+ (dirtype == OVL_UPPER) ? 0 : dirnum);
+
+ if (!redirect_list) {
+ redirect_list = new;
+ } else {
+ for (last = redirect_list; last->next; last = last->next);
+ last->next = new;
+ }
+ new->next = NULL;
+ new->dirtype = dirtype;
+ new->dirnum = dirnum;
+ strncpy(new->origin, origin, sizeof(new->origin));
+ strncpy(new->path, path, sizeof(new->path));
+}
+
+static bool vol_redirect_entry_find(const char *origin, int dirtype,
+ int dirnum, char **founded)
+{
+ struct ovl_redirect_entry *entry;
+
+ if (!redirect_list)
+ return false;
+
+ for (entry = redirect_list; entry; entry = entry->next) {
+ bool same_layer;
+
+ print_debug(_("Redirect entry found:[%s %s %s %d]\n"),
+ entry->origin, entry->path,
+ (entry->dirtype == OVL_UPPER) ? "UP" : "LOW",
+ (entry->dirtype == OVL_UPPER) ? 0 : entry->dirnum);
+
+ same_layer = ((entry->dirtype == dirtype) &&
+ (dirtype == OVL_LOWER ? (entry->dirnum == dirnum) : true));
+
+ if (same_layer && !strcmp(entry->origin, origin)) {
+ *founded = entry->path;
+ return true;
+ }
+ }
+
+ return false;
+}
+
+static void vol_redirect_free(void)
+{
+ struct ovl_redirect_entry *entry;
+
+ while (redirect_list) {
+ entry = redirect_list;
+ redirect_list = redirect_list->next;
+ free(entry);
+ }
+}
+
+/*
+ * Get redirect origin directory stored in the xattr, check it's invlaid
+ * or not, In auto-mode, invalid redirect xattr will be removed directly.
+ * Do the follow checking:
+ * 1) Check the origin directory exist or not. If not, remove xattr.
+ * 2) Count how many directories the origin directory was redirected by.
+ * If more than one in the same layer, there must be some inconsistency
+ * but not sure, just warn.
+ * 3) Check and fix the missing whiteout or opaque in redierct parent dir.
+ */
+static int ovl_check_redirect(struct scan_ctx *sctx)
+{
+ const char *pathname = sctx->pathname;
+ struct ovl_lower_check chk = {0};
+ char redirect_rpath[PATH_MAX];
+ struct stat rst;
+ char *redirect = NULL;
+ unsigned int start;
+ int ret = 0;
+
+ /* Get redirect */
+ ret = ovl_get_redirect(pathname, sctx->dirlen,
+ sctx->filelen, &redirect);
+ if (ret || !redirect)
+ return ret;
+
+ print_debug(_("Dir %s has redirect %s\n"), pathname, redirect);
+
+ /* Redirect dir in last lower dir ? */
+ if (sctx->dirtype == OVL_LOWER && sctx->num == lower_num-1)
+ goto remove;
+
+ /* Scan lower directories to check redirect dir exist or not */
+ start = (sctx->dirtype == OVL_LOWER) ? sctx->num + 1 : 0;
+ ret = ovl_check_lower(redirect, start, &chk, false);
+ if (ret)
+ goto out;
+ if (chk.exist && is_dir(&chk.st)) {
+ char *tmp;
+
+ /* Check duplicate in same layer */
+ if (vol_redirect_entry_find(chk.path, sctx->dirtype,
+ sctx->num, &tmp)) {
+ print_info("Duplicate redirect directories found:\n");
+ print_info("origin:%s current:%s latest:%s\n",
+ chk.path, pathname, tmp);
+
+ set_st_inconsistency(&status);
+ }
+
+ ovl_redirect_entry_add(pathname, sctx->dirtype,
+ sctx->num, chk.path);
+
+ /* Check and fix whiteout or opaque dir */
+ snprintf(redirect_rpath, sizeof(redirect_rpath), "%s%s",
+ sctx->dirname, redirect);
+ if (lstat(redirect_rpath, &rst) != 0) {
+ if (errno != ENOENT && errno != ENOTDIR) {
+ print_err(_("Cannot stat %s: %s\n"),
+ redirect_rpath, strerror(errno));
+ goto out;
+ }
+
+ /* Found nothing, create a whiteout */
+ ret = ovl_create_whiteout(redirect_rpath);
+
+ } else if (is_dir(&rst) && !ovl_is_opaque(redirect_rpath)) {
+ /* Found a directory but not opaqued, fix opaque xattr */
+ ret = ovl_set_opaque(redirect_rpath);
+ }
+
+ goto out;
+ }
+
+remove:
+ /* Remove redirect xattr or ask user */
+ print_info(_("Invalid redirect xattr: %s "), pathname);
+ if (!ask_question("Remove", 1))
+ goto out;
+
+ ret = ovl_remove_redirect(pathname);
+out:
+ free(redirect);
+ return ret;
+}
+
+static struct scan_operations ovl_scan_ops = {
+ .whiteout = ovl_check_whiteout,
+ .opaque = ovl_check_opaque,
+ .redirect = ovl_check_redirect,
+};
+
+static void ovl_scan_clean(void)
+{
+ /* Clean redirect entry record */
+ vol_redirect_free();
+}
+
+/* Scan upperdir and each lowerdirs, check and fix inconsistency */
+int ovl_scan_fix(void)
+{
+ struct scan_ctx sctx;
+ unsigned int i;
+ int ret = 0;
+
+ if (flags | FL_VERBOSE)
+ print_info(_("Scan and fix: [whiteouts|opaque|redirectdir]\n"));
+
+ /* Scan upper directory */
+ if (flags | FL_VERBOSE)
+ print_info(_("Scan upper directory: %s\n"), upperdir);
+
+ sctx.dirname = upperdir;
+ sctx.dirlen = strlen(upperdir);
+ sctx.dirtype = OVL_UPPER;
+
+ ret = scan_dir(&sctx, &ovl_scan_ops);
+ if (ret)
+ goto out;
+
+ /* Scan every lower directories */
+ for (i = 0; i < lower_num; i++) {
+ if (flags | FL_VERBOSE)
+ print_info(_("Scan upper directory: %s\n"), lowerdir[i]);
+
+ sctx.dirname = lowerdir[i];
+ sctx.dirlen = strlen(lowerdir[i]);
+ sctx.dirtype = OVL_LOWER;
+ sctx.num = i;
+
+ ret = scan_dir(&sctx, &ovl_scan_ops);
+ if (ret)
+ goto out;
+ }
+out:
+ ovl_scan_clean();
+ return ret;
+}
diff --git a/check.h b/check.h
new file mode 100644
index 0000000..373ff3a
--- /dev/null
+++ b/check.h
@@ -0,0 +1,7 @@
+#ifndef OVL_WHITECHECK_H
+#define OVL_WHITECHECK_H
+
+/* Scan upperdir and each lowerdirs, check and fix inconsistency */
+int ovl_scan_fix(void);
+
+#endif /* OVL_WHITECHECK_H */
diff --git a/common.c b/common.c
new file mode 100644
index 0000000..4e77045
--- /dev/null
+++ b/common.c
@@ -0,0 +1,95 @@
+/*
+ *
+ * Common things for all utilities
+ *
+ * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "common.h"
+#include "config.h"
+
+extern char *program_name;
+
+/* #define DEBUG 1 */
+#ifdef DEBUG
+void print_debug(char *fmtstr, ...)
+{
+ va_list args;
+
+ va_start(args, fmtstr);
+ fprintf(stdout, "%s:[Debug]: ", program_name);
+ vfprintf(stdout, fmtstr, args);
+ va_end(args);
+}
+#else
+void print_debug (char *fmtstr, ...) {}
+#endif
+
+void print_info(char *fmtstr, ...)
+{
+ va_list args;
+
+ va_start(args, fmtstr);
+ vfprintf(stdout, fmtstr, args);
+ va_end(args);
+}
+
+void print_err(char *fmtstr, ...)
+{
+ va_list args;
+
+ va_start(args, fmtstr);
+ fprintf(stderr, "%s:[Error]: ", program_name);
+ vfprintf(stderr, fmtstr, args);
+ va_end(args);
+}
+
+void *smalloc(size_t size)
+{
+ void *new = malloc(size);
+
+ if (!new) {
+ print_err(_("malloc error:%s\n"), strerror(errno));
+ exit(1);
+ }
+
+ memset(new, 0, size);
+ return new;
+}
+
+void *srealloc(void *addr, size_t size)
+{
+ void *re = realloc(addr, size);
+
+ if (!re) {
+ print_err(_("malloc error:%s\n"), strerror(errno));
+ exit(1);
+ }
+ return re;
+}
+
+char *sstrdup(const char *src)
+{
+ char *dst = strdup(src);
+
+ if (!dst) {
+ print_err(_("strdup error:%s\n"), strerror(errno));
+ exit(1);
+ }
+
+ return dst;
+}
+
+void version(void)
+{
+ printf(_("Overlay utilities version %s\n"), PACKAGE_VERSION);
+}
diff --git a/common.h b/common.h
new file mode 100644
index 0000000..c4707e7
--- /dev/null
+++ b/common.h
@@ -0,0 +1,34 @@
+#ifndef OVL_COMMON_H
+#define OVL_COMMON_H
+
+#ifndef __attribute__
+# if !defined __GNUC__ || __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
+# define __attribute__(x)
+# endif
+#endif
+
+#ifdef USE_GETTEXT
+#include <libintl.h>
+#define _(x) gettext((x))
+#else
+#define _(x) (x)
+#endif
+
+/* Print an error message */
+void print_err(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
+
+/* Print an info message */
+void print_info(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
+
+/* Print an debug message */
+void print_debug(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
+
+/* Safety wrapper */
+void *smalloc(size_t size);
+void *srealloc(void *addr, size_t size);
+char *sstrdup(const char *src);
+
+/* Print program version */
+void version(void);
+
+#endif /* OVL_COMMON_H */
diff --git a/config.h b/config.h
new file mode 100644
index 0000000..deac089
--- /dev/null
+++ b/config.h
@@ -0,0 +1,22 @@
+#ifndef OVL_CONFIG_H
+#define OVL_CONFIG_H
+
+/* program version */
+#define PACKAGE_VERSION "v1.0.0"
+
+/* overlay max lower stacks (the same to kernel overlayfs driver) */
+#define OVL_MAX_STACK 500
+
+/* File with mounted filesystems */
+#define MOUNT_TAB "/proc/mounts"
+
+/* Name of overlay filesystem type */
+#define OVERLAY_NAME "overlay"
+#define OVERLAY_NAME_OLD "overlayfs"
+
+/* Mount options */
+#define OPT_LOWERDIR "lowerdir="
+#define OPT_UPPERDIR "upperdir="
+#define OPT_WORKDIR "workdir="
+
+#endif
diff --git a/fsck.c b/fsck.c
new file mode 100644
index 0000000..cbcb8e9
--- /dev/null
+++ b/fsck.c
@@ -0,0 +1,179 @@
+/*
+ *
+ * Utility to fsck overlay
+ *
+ * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <getopt.h>
+#include <libgen.h>
+#include <stdbool.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <linux/limits.h>
+
+#include "common.h"
+#include "config.h"
+#include "lib.h"
+#include "check.h"
+#include "mount.h"
+
+char *program_name;
+
+char **lowerdir;
+char upperdir[PATH_MAX] = {0};
+char workdir[PATH_MAX] = {0};
+unsigned int lower_num;
+int flags; /* user input option flags */
+int status; /* fsck scan status */
+
+/* Cleanup lower directories buf */
+static void ovl_clean_lowerdirs(void)
+{
+ unsigned int i;
+
+ for (i = 0; i < lower_num; i++) {
+ free(lowerdir[i]);
+ lowerdir[i] = NULL;
+ lower_num = 0;
+ }
+ free(lowerdir);
+ lowerdir = NULL;
+}
+
+static void usage(void)
+{
+ print_info(_("Usage:\n\t%s [-l lowerdir] [-u upperdir] [-w workdir] "
+ "[-avhV]\n\n"), program_name);
+ print_info(_("Options:\n"
+ "-l, --lowerdir=LOWERDIR specify lower directories of overlayfs,\n"
+ " multiple lower use ':' as separator\n"
+ "-u, --upperdir=UPPERDIR specify upper directory of overlayfs\n"
+ "-w, --workdir=WORKDIR specify work directory of overlayfs\n"
+ "-a, --auto repair automatically (no questions)\n"
+ "-v, --verbose print more messages of overlayfs\n"
+ "-h, --help display this usage of overlayfs\n"
+ "-V, --version display version information\n"));
+ exit(1);
+}
+
+static void parse_options(int argc, char *argv[])
+{
+ char *lowertemp;
+ int c;
+ int ret = 0;
+
+ struct option long_options[] = {
+ {"lowerdir", required_argument, NULL, 'l'},
+ {"upperdir", required_argument, NULL, 'u'},
+ {"workdir", required_argument, NULL, 'w'},
+ {"auto", no_argument, NULL, 'a'},
+ {"verbose", no_argument, NULL, 'v'},
+ {"version", no_argument, NULL, 'V'},
+ {"help", no_argument, NULL, 'h'},
+ {NULL, 0, NULL, 0}
+ };
+
+ while ((c = getopt_long(argc, argv, "l:u:w:avVh", long_options, NULL)) != -1) {
+ switch (c) {
+ case 'l':
+ lowertemp = strdup(optarg);
+ ret = ovl_resolve_lowerdirs(lowertemp, &lowerdir, &lower_num);
+ free(lowertemp);
+ break;
+ case 'u':
+ if (realpath(optarg, upperdir)) {
+ print_debug(_("Upperdir:%s\n"), upperdir);
+ flags |= FL_UPPER;
+ } else {
+ print_err(_("Failed to resolve upperdir:%s\n"), optarg);
+ ret = -1;
+ }
+ break;
+ case 'w':
+ if (realpath(optarg, workdir)) {
+ print_debug(_("Workdir:%s\n"), workdir);
+ flags |= FL_WORK;
+ } else {
+ print_err(_("Failed to resolve workdir:%s\n"), optarg);
+ ret = -1;
+ }
+ break;
+ case 'a':
+ flags |= FL_AUTO;
+ break;
+ case 'v':
+ flags |= FL_VERBOSE;
+ break;
+ case 'V':
+ version();
+ return;
+ case 'h':
+ default:
+ usage();
+ return;
+ }
+
+ if (ret)
+ exit(1);
+ }
+
+ if (!lower_num || (!(flags & FL_UPPER) && lower_num == 1)) {
+ print_info(_("Please specify correct lowerdirs and upperdir\n"));
+ usage();
+ }
+}
+
+void fsck_status_check(int *val)
+{
+ if (status & OVL_ST_INCONSISTNECY) {
+ *val |= FSCK_UNCORRECTED;
+ print_info(_("Still have unexpected inconsistency!\n"));
+ }
+
+ if (status & OVL_ST_ABORT) {
+ *val |= FSCK_ERROR;
+ print_info(_("Cannot continue, aborting\n"));
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ bool mounted;
+ int err = 0;
+ int exit_value = 0;
+
+ program_name = basename(argv[0]);
+
+ parse_options(argc, argv);
+
+ /* Ensure overlay filesystem not mounted */
+ if ((err = ovl_check_mount(&mounted)))
+ goto out;
+ if (!mounted) {
+ set_st_abort(&status);
+ goto out;
+ }
+
+ /* Scan and fix */
+ if ((err = ovl_scan_fix()))
+ goto out;
+
+out:
+ fsck_status_check(&exit_value);
+ ovl_clean_lowerdirs();
+
+ if (err)
+ exit_value |= FSCK_ERROR;
+ if (exit_value)
+ print_info("WARNING: Filesystem check failed, may not clean\n");
+ else
+ print_info("Filesystem clean\n");
+
+ return exit_value;
+}
diff --git a/lib.c b/lib.c
new file mode 100644
index 0000000..a6832fe
--- /dev/null
+++ b/lib.c
@@ -0,0 +1,197 @@
+/*
+ *
+ * Common things for all utilities
+ *
+ * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <stdbool.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/xattr.h>
+#include <fts.h>
+
+#include "common.h"
+#include "lib.h"
+
+extern int flags;
+extern int status;
+
+static int ask_yn(const char *question, int def)
+{
+ char ans[16];
+
+ print_info(_("%s ? [%s]: \n"), question, def ? _("y") : _("n"));
+ fflush(stdout);
+ while (fgets(ans, sizeof(ans)-1, stdin)) {
+ if (ans[0] == '\n')
+ return def;
+ else if (!strcasecmp(ans, "y\n") || !strcasecmp(ans, "yes\n"))
+ return 1;
+ else if (!strcasecmp(ans, "n\n") || !strcasecmp(ans, "no\n"))
+ return 0;
+ else
+ print_info(_("Illegal answer. Please input y/n or yes/no:"));
+ fflush(stdout);
+ }
+ return def;
+}
+
+/* Ask user */
+int ask_question(const char *question, int def)
+{
+ if (flags & FL_AUTO) {
+ print_info(_("%s? %s\n"), question, def ? _("y") : _("n"));
+ return def;
+ }
+
+ return ask_yn(question, def);
+}
+
+ssize_t get_xattr(const char *pathname, const char *xattrname,
+ char **value, bool *exist)
+{
+ char *buf = NULL;
+ ssize_t ret;
+
+ ret = getxattr(pathname, xattrname, NULL, 0);
+ if (ret < 0) {
+ if (errno == ENODATA || errno == ENOTSUP) {
+ if (exist)
+ *exist = false;
+ return 0;
+ } else {
+ goto fail;
+ }
+ }
+
+ /* Zero size value means xattr exist but value unknown */
+ if (exist)
+ *exist = true;
+ if (ret == 0 || !value)
+ return 0;
+
+ buf = smalloc(ret+1);
+ ret = getxattr(pathname, xattrname, buf, ret);
+ if (ret <= 0)
+ goto fail2;
+
+ buf[ret] = '\0';
+ *value = buf;
+ return ret;
+
+fail2:
+ free(buf);
+fail:
+ print_err(_("Cannot getxattr %s %s: %s\n"), pathname,
+ xattrname, strerror(errno));
+ return -1;
+}
+
+int set_xattr(const char *pathname, const char *xattrname,
+ void *value, size_t size)
+{
+ int ret;
+
+ ret = setxattr(pathname, xattrname, value, size, XATTR_CREATE);
+ if (ret && ret != EEXIST)
+ goto fail;
+
+ if (ret == EEXIST) {
+ ret = setxattr(pathname, xattrname, value, size, XATTR_REPLACE);
+ if (ret)
+ goto fail;
+ }
+
+ return 0;
+fail:
+ print_err(_("Cannot setxattr %s %s: %s\n"), pathname,
+ xattrname, strerror(errno));
+ return ret;
+}
+
+int remove_xattr(const char *pathname, const char *xattrname)
+{
+ int ret;
+ if ((ret = removexattr(pathname, xattrname)))
+ print_err(_("Cannot removexattr %s %s: %s\n"), pathname,
+ xattrname, strerror(errno));
+ return ret;
+}
+
+static inline int __check_entry(struct scan_ctx *sctx,
+ int (*do_check)(struct scan_ctx *))
+{
+ return do_check ? do_check(sctx) : 0;
+}
+
+/* Scan specified directories and invoke callback */
+int scan_dir(struct scan_ctx *sctx, struct scan_operations *sop)
+{
+ char *paths[2] = {(char *)sctx->dirname, NULL};
+ FTS *ftsp;
+ FTSENT *ftsent;
+ int ret = 0;
+
+ ftsp = fts_open(paths, FTS_NOCHDIR | FTS_PHYSICAL, NULL);
+ if (ftsp == NULL) {
+ print_err(_("Failed to fts open %s:%s\n"),
+ sctx->dirname, strerror(errno));
+ return -1;
+ }
+
+ while ((ftsent = fts_read(ftsp)) != NULL) {
+ int err;
+
+ print_debug(_("Scan:%-3s %2d %7jd %-40s %s\n"),
+ (ftsent->fts_info == FTS_D) ? "d" :
+ (ftsent->fts_info == FTS_DNR) ? "dnr" :
+ (ftsent->fts_info == FTS_DP) ? "dp" :
+ (ftsent->fts_info == FTS_F) ? "f" :
+ (ftsent->fts_info == FTS_NS) ? "ns" :
+ (ftsent->fts_info == FTS_SL) ? "sl" :
+ (ftsent->fts_info == FTS_SLNONE) ? "sln" :
+ (ftsent->fts_info == FTS_DEFAULT) ? "df" : "???",
+ ftsent->fts_level, ftsent->fts_statp->st_size,
+ ftsent->fts_path, ftsent->fts_name);
+
+
+ /* Fillup base context */
+ sctx->pathname = ftsent->fts_path;
+ sctx->pathlen = ftsent->fts_pathlen;
+ sctx->filename = ftsent->fts_name;
+ sctx->filelen = ftsent->fts_namelen;
+ sctx->st = ftsent->fts_statp;
+
+ switch (ftsent->fts_info) {
+ case FTS_DEFAULT:
+ /* Check whiteouts */
+ err = __check_entry(sctx, sop->whiteout);
+ ret = (ret || !err) ? ret : err;
+ break;
+ case FTS_D:
+ /* Check opaque and redirect */
+ err = __check_entry(sctx, sop->opaque);
+ ret = (ret || !err) ? ret : err;
+
+ err = __check_entry(sctx, sop->redirect);
+ ret = (ret || !err) ? ret : err;
+ break;
+ case FTS_NS:
+ case FTS_DNR:
+ case FTS_ERR:
+ print_err(_("Failed to fts read %s:%s\n"),
+ ftsent->fts_path, strerror(ftsent->fts_errno));
+ goto out;
+ }
+ }
+out:
+ fts_close(ftsp);
+ return ret;
+}
diff --git a/lib.h b/lib.h
new file mode 100644
index 0000000..463b263
--- /dev/null
+++ b/lib.h
@@ -0,0 +1,73 @@
+#ifndef OVL_LIB_H
+#define OVL_LIB_H
+
+/* Common return value */
+#define FSCK_OK 0 /* No errors */
+#define FSCK_NONDESTRUCT 1 /* File system errors corrected */
+#define FSCK_REBOOT 2 /* System should be rebooted */
+#define FSCK_UNCORRECTED 4 /* File system errors left uncorrected */
+#define FSCK_ERROR 8 /* Operational error */
+#define FSCK_USAGE 16 /* Usage or syntax error */
+#define FSCK_CANCELED 32 /* Aborted with a signal or ^C */
+#define FSCK_LIBRARY 128 /* Shared library error */
+
+/* Fsck status */
+#define OVL_ST_INCONSISTNECY (1 << 0)
+#define OVL_ST_ABORT (1 << 1)
+
+/* Option flags */
+#define FL_VERBOSE (1 << 0) /* verbose */
+#define FL_UPPER (1 << 1) /* specify upper directory */
+#define FL_WORK (1 << 2) /* specify work directory */
+#define FL_AUTO (1 << 3) /* automactically scan dirs and repair */
+
+/* Scan path type */
+#define OVL_UPPER 0
+#define OVL_LOWER 1
+#define OVL_WORKER 2
+#define OVL_PTYPE_MAX 3
+
+/* Xattr */
+#define OVL_OPAQUE_XATTR "trusted.overlay.opaque"
+#define OVL_REDIRECT_XATTR "trusted.overlay.redirect"
+
+/* Directories scan data struct */
+struct scan_ctx {
+ const char *dirname; /* upper/lower root dir */
+ size_t dirlen; /* strlen(dirlen) */
+ int dirtype; /* OVL_UPPER or OVL_LOWER */
+ int num; /* lower dir depth, lower type use only */
+
+ const char *pathname; /* file path from the root */
+ size_t pathlen; /* strlen(pathname) */
+ const char *filename; /* filename */
+ size_t filelen; /* strlen(filename) */
+ struct stat *st; /* file stat */
+};
+
+/* Directories scan callback operations struct */
+struct scan_operations {
+ int (*whiteout)(struct scan_ctx *);
+ int (*opaque)(struct scan_ctx *);
+ int (*redirect)(struct scan_ctx *);
+};
+
+static inline void set_st_inconsistency(int *st)
+{
+ *st |= OVL_ST_INCONSISTNECY;
+}
+
+static inline void set_st_abort(int *st)
+{
+ *st |= OVL_ST_ABORT;
+}
+
+int scan_dir(struct scan_ctx *sctx, struct scan_operations *sop);
+int ask_question(const char *question, int def);
+ssize_t get_xattr(const char *pathname, const char *xattrname,
+ char **value, bool *exist);
+int set_xattr(const char *pathname, const char *xattrname,
+ void *value, size_t size);
+int remove_xattr(const char *pathname, const char *xattrname);
+
+#endif /* OVL_LIB_H */
diff --git a/mount.c b/mount.c
new file mode 100644
index 0000000..28ce8e5
--- /dev/null
+++ b/mount.c
@@ -0,0 +1,319 @@
+/*
+ *
+ * Check mounted overlay
+ *
+ * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <getopt.h>
+#include <libgen.h>
+#include <stdbool.h>
+#include <mntent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <linux/limits.h>
+
+#include "common.h"
+#include "config.h"
+#include "lib.h"
+#include "check.h"
+#include "mount.h"
+
+struct ovl_mnt_entry {
+ char *lowers;
+ char **lowerdir;
+ unsigned int lowernum;
+ char upperdir[PATH_MAX];
+ char workdir[PATH_MAX];
+};
+
+/* Mount buf allocate a time */
+#define ALLOC_NUM 16
+
+extern char **lowerdir;
+extern char upperdir[];
+extern char workdir[];
+extern unsigned int lower_num;
+
+/*
+ * Split directories to individual one.
+ * (copied from linux kernel, see fs/overlayfs/super.c)
+ */
+static unsigned int ovl_split_lowerdirs(char *lower)
+{
+ unsigned int ctr = 1;
+ char *s, *d;
+
+ for (s = d = lower;; s++, d++) {
+ if (*s == '\\') {
+ s++;
+ } else if (*s == ':') {
+ *d = '\0';
+ ctr++;
+ continue;
+ }
+ *d = *s;
+ if (!*s)
+ break;
+ }
+ return ctr;
+}
+
+/* Resolve each lower directories and check the validity */
+int ovl_resolve_lowerdirs(char *loweropt, char ***lowerdir,
+ unsigned int *lowernum)
+{
+ unsigned int num;
+ char **dirs;
+ char *p;
+ int i;
+
+ num = ovl_split_lowerdirs(loweropt);
+ if (num > OVL_MAX_STACK) {
+ print_err(_("Too many lower directories:%u, max:%u\n"),
+ num, OVL_MAX_STACK);
+ return -1;
+ }
+
+ dirs = smalloc(sizeof(char *) * num);
+
+ p = loweropt;
+ for (i = 0; i < num; i++) {
+ dirs[i] = smalloc(PATH_MAX);
+ if (!realpath(p, dirs[i])) {
+ print_err(_("Failed to resolve lowerdir:%s:%s\n"),
+ p, strerror(errno));
+ goto err;
+ }
+ print_debug(_("Lowerdir %u:%s\n"), i, dirs[i]);
+ p = strchr(p, '\0') + 1;
+ }
+
+ *lowerdir = dirs;
+ *lowernum = num;
+
+ return 0;
+err:
+ for (i--; i >= 0; i--)
+ free(dirs[i]);
+ free(dirs);
+ *lowernum = 0;
+ return -1;
+}
+
+/*
+ * Split and return next opt.
+ * (copied from linux kernel, see fs/overlayfs/super.c)
+ */
+static char *ovl_next_opt(char **s)
+{
+ char *sbegin = *s;
+ char *p;
+
+ if (sbegin == NULL)
+ return NULL;
+
+ for (p = sbegin; *p; p++) {
+ if (*p == '\\') {
+ p++;
+ if (!*p)
+ break;
+ } else if (*p == ',') {
+ *p = '\0';
+ *s = p + 1;
+ return sbegin;
+ }
+ }
+ *s = NULL;
+ return sbegin;
+}
+
+/*
+ * Split and parse opt to each directories.
+ *
+ * Note: FIXME: We cannot distinguish mounted directories if overlayfs was
+ * mounted use relative path, so there may have misjudgment.
+ */
+static int ovl_parse_opt(char *opt, struct ovl_mnt_entry *entry)
+{
+ char tmp[PATH_MAX] = {0};
+ char *p;
+ int len;
+ int ret;
+ int i;
+
+ while ((p = ovl_next_opt(&opt)) != NULL) {
+ if (!*p)
+ continue;
+
+ if (!strncmp(p, OPT_UPPERDIR, strlen(OPT_UPPERDIR))) {
+ len = strlen(p) - strlen(OPT_UPPERDIR) + 1;
+ strncpy(tmp, p+strlen(OPT_UPPERDIR), len);
+
+ if (!realpath(tmp, entry->upperdir)) {
+ print_err(_("Faile to resolve path:%s:%s\n"),
+ tmp, strerror(errno));
+ ret = -1;
+ goto errout;
+ }
+ } else if (!strncmp(p, OPT_LOWERDIR, strlen(OPT_LOWERDIR))) {
+ len = strlen(p) - strlen(OPT_LOWERDIR) + 1;
+ entry->lowers = smalloc(len);
+ strncpy(entry->lowers, p+strlen(OPT_LOWERDIR), len);
+
+ if ((ret = ovl_resolve_lowerdirs(entry->lowers,
+ &entry->lowerdir, &entry->lowernum)))
+ goto errout;
+
+ } else if (!strncmp(p, OPT_WORKDIR, strlen(OPT_WORKDIR))) {
+ len = strlen(p) - strlen(OPT_WORKDIR) + 1;
+ strncpy(tmp, p+strlen(OPT_WORKDIR), len);
+
+ if (!realpath(tmp, entry->workdir)) {
+ print_err(_("Faile to resolve path:%s:%s\n"),
+ tmp, strerror(errno));
+ ret = -1;
+ goto errout;
+ }
+ }
+ }
+
+errout:
+ if (entry->lowernum) {
+ for (i = 0; i < entry->lowernum; i++)
+ free(entry->lowerdir[i]);
+ free(entry->lowerdir);
+ entry->lowerdir = NULL;
+ entry->lowernum = 0;
+ }
+ free(entry->lowers);
+ entry->lowers = NULL;
+
+ return ret;
+}
+
+/* Scan current mounted overlayfs and get used underlying directories */
+static int ovl_scan_mount_init(struct ovl_mnt_entry **ovl_mnt_entries,
+ int *ovl_mnt_count)
+{
+ struct ovl_mnt_entry *mnt_entries;
+ struct mntent *mnt;
+ FILE *fp;
+ char *opt;
+ int allocated, num = 0;
+
+ fp = setmntent(MOUNT_TAB, "r");
+ if (!fp) {
+ print_err(_("Fail to setmntent %s:%s\n"),
+ MOUNT_TAB, strerror(errno));
+ return -1;
+ }
+
+ allocated = ALLOC_NUM;
+ mnt_entries = smalloc(sizeof(struct ovl_mnt_entry) * allocated);
+
+ while ((mnt = getmntent(fp))) {
+ if (!strcmp(mnt->mnt_type, OVERLAY_NAME) ||
+ !strcmp(mnt->mnt_type, OVERLAY_NAME_OLD)) {
+
+ opt = sstrdup(mnt->mnt_opts);
+ if (ovl_parse_opt(opt, &mnt_entries[num])) {
+ free(opt);
+ continue;
+ }
+
+ num++;
+ if (num % ALLOC_NUM == 0) {
+ allocated += ALLOC_NUM;
+ mnt_entries = srealloc(mnt_entries,
+ sizeof(struct ovl_mnt_entry) * allocated);
+ }
+
+ free(opt);
+ }
+ }
+
+ *ovl_mnt_entries = mnt_entries;
+ *ovl_mnt_count = num;
+
+ endmntent(fp);
+ return 0;
+}
+
+static void ovl_scan_mount_exit(struct ovl_mnt_entry *ovl_mnt_entries,
+ int ovl_mnt_count)
+{
+ int i,j;
+
+ for (i = 0; i < ovl_mnt_count; i++) {
+ for (j = 0; j < ovl_mnt_entries[i].lowernum; j++)
+ free(ovl_mnt_entries[i].lowerdir[j]);
+ free(ovl_mnt_entries[i].lowerdir);
+ free(ovl_mnt_entries[i].lowers);
+ }
+ free(ovl_mnt_entries);
+}
+
+/*
+ * Scan every mounted filesystem, check the overlay directories want
+ * to check is already mounted. Check and fix an online overlay is not
+ * allowed.
+ *
+ * Note: fsck may modify lower layers, so even match only one directory
+ * is triggered as mounted.
+ */
+int ovl_check_mount(bool *pass)
+{
+ struct ovl_mnt_entry *ovl_mnt_entries;
+ int ovl_mnt_entry_count;
+ char *mounted_path;
+ bool mounted;
+ int i,j,k;
+ int ret;
+
+ ret = ovl_scan_mount_init(&ovl_mnt_entries, &ovl_mnt_entry_count);
+ if (ret)
+ return ret;
+
+ /* Only check hard matching */
+ for (i = 0; i < ovl_mnt_entry_count; i++) {
+ /* Check lower */
+ for (j = 0; j < ovl_mnt_entries[i].lowernum; j++) {
+ for (k = 0; k < lower_num; k++) {
+ if (!strcmp(lowerdir[k],
+ ovl_mnt_entries[i].lowerdir[j])) {
+ mounted_path = lowerdir[k];
+ mounted = true;
+ goto out;
+ }
+ }
+ }
+
+ /* Check upper */
+ if (!(strcmp(upperdir, ovl_mnt_entries[i].upperdir))) {
+ mounted_path = upperdir;
+ mounted = true;
+ goto out;
+ }
+
+ /* Check worker */
+ if (workdir[0] != '\0' && !(strcmp(workdir, ovl_mnt_entries[i].workdir))) {
+ mounted_path = workdir;
+ mounted = true;
+ goto out;
+ }
+ }
+out:
+ ovl_scan_mount_exit(ovl_mnt_entries, ovl_mnt_entry_count);
+
+ if (mounted)
+ print_info(_("Dir %s is mounted\n"), mounted_path);
+ *pass = !mounted;
+
+ return 0;
+}
diff --git a/mount.h b/mount.h
new file mode 100644
index 0000000..8a3762d
--- /dev/null
+++ b/mount.h
@@ -0,0 +1,8 @@
+#ifndef OVL_MOUNT_H
+#define OVL_MOUNT_H
+
+int ovl_resolve_lowerdirs(char *loweropt, char ***lowerdir,
+ unsigned int *lowernum);
+int ovl_check_mount(bool *mounted);
+
+#endif /* OVL_MOUNT_H */
diff --git a/test/README.md b/test/README.md
new file mode 100644
index 0000000..71dbad8
--- /dev/null
+++ b/test/README.md
@@ -0,0 +1,12 @@
+fsck.overlay test
+=================
+
+This test cases simulate different inconsistency of overlay filesystem
+underlying directories, test fsck.overlay can repair them correctly or not.
+
+USAGE
+=====
+
+1. Check "local.config", modify config value to appropriate one.
+2. ./auto_test.sh
+3. After testing, the result file and log file created in the result directory.
diff --git a/test/auto_test.sh b/test/auto_test.sh
new file mode 100755
index 0000000..8248e24
--- /dev/null
+++ b/test/auto_test.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+. ./src/prepare.sh
+
+echo "***************"
+
+# 1. Test whiteout
+echo -e "1.Test Whiteout\n"
+$SOURCE_DIR/whiteout_test.sh >> $LOG_FILE 2>&1
+if [ $? -ne 0 ]; then
+ echo -e "Result:\033[31m Fail\033[0m\n"
+ RESULT="Fail"
+else
+ echo -e "Result:\033[32m Pass\033[0m\n"
+ RESULT="Pass"
+fi
+
+echo -e "Test whiteout: $RESULT" >> $RESOULT_FILE
+
+# 2. Test opaque dir
+echo -e "2.Test opaque directory\n"
+$SOURCE_DIR/opaque_test.sh >> $LOG_FILE 2>&1
+if [ $? -ne 0 ]; then
+ echo -e "Result:\033[31m Fail\033[0m\n"
+ RESULT="Fail"
+else
+ echo -e "Result:\033[32m Pass\033[0m\n"
+ RESULT="Pass"
+fi
+
+echo -e "Test opaque directory: $RESULT" >> $RESOULT_FILE
+
+# 3. Test redirect dir
+echo -e "3.Test redirect direcotry\n"
+$SOURCE_DIR/redirect_test.sh >> $LOG_FILE 2>&1
+if [ $? -ne 0 ]; then
+ echo -e "Result:\033[31m Fail\033[0m\n"
+ RESULT="Fail"
+else
+ echo -e "Result:\033[32m Pass\033[0m\n"
+ RESULT="Pass"
+fi
+
+echo -e "Test redirect direcotry: $RESULT" >> $RESOULT_FILE
+
+echo "***************"
diff --git a/test/clean.sh b/test/clean.sh
new file mode 100755
index 0000000..80f360b
--- /dev/null
+++ b/test/clean.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. ./src/prepare.sh
+
+rm -rf $RESULT_DIR
+rm -rf $TEST_DIR
diff --git a/test/local.config b/test/local.config
new file mode 100644
index 0000000..990395f
--- /dev/null
+++ b/test/local.config
@@ -0,0 +1,16 @@
+# Config
+export OVL_FSCK=fsck.overlay
+export TEST_DIR=/mnt/test
+
+# Base environment
+export PWD=`pwd`
+export RESULT_DIR=$PWD/result
+export SOURCE_DIR=$PWD/src
+
+# Overlayfs config
+export LOWER_DIR="lower"
+export UPPER_DIR="upper"
+export WORK_DIR="worker"
+export MERGE_DIR="merge"
+export LOWER_DIR1="lower1"
+export WORK_DIR1="worker1"
diff --git a/test/src/opaque_test.sh b/test/src/opaque_test.sh
new file mode 100755
index 0000000..7cb5030
--- /dev/null
+++ b/test/src/opaque_test.sh
@@ -0,0 +1,144 @@
+#!/bin/bash
+
+. ./local.config
+
+__clean()
+{
+ rm -rf $TEST_DIR/*
+ cd $PWD
+}
+
+OVL_OPAQUE_XATTR="trusted.overlay.opaque"
+OVL_OPAQUE_XATTR_VAL="y"
+RET=0
+
+cd $TEST_DIR
+rm -rf *
+mkdir $LOWER_DIR $LOWER_DIR1 $UPPER_DIR $WORK_DIR
+
+# 1.Test lower invalid opaque directory
+echo "***** 1.Test lower invalid opaque directory *****"
+mkdir $LOWER_DIR/testdir
+setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir
+if [[ $? -eq 0 ]];then
+ echo "ERROR: lower's invalid opaque xattr not remove"
+ RET=$(($RET+1))
+fi
+rm -rf $LOWER_DIR/*
+
+# 2.Test upper invalid opaque directory
+echo "***** 2.Test upper invalid opaque directory *****"
+mkdir -p $UPPER_DIR/testdir0/testdir1
+setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir0/testdir1
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir0/testdir1
+if [[ $? -eq 0 ]];then
+ echo "ERROR: upper's invalid opaque xattr not remove"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+
+# 3.Test upper opaque direcotry in merged directory
+echo "***** 3.Test upper opaque direcotry in merged directory *****"
+mkdir $UPPER_DIR/testdir
+setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
+if [[ $? -ne 0 ]];then
+ echo "ERROR: upper's opaque xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+
+# 4.Test upper opaque direcotry cover lower file
+echo "***** 4.Test upper opaque direcotry cover lower file *****"
+mkdir $UPPER_DIR/testdir
+mkdir $LOWER_DIR/testdir
+setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
+if [[ $? -ne 0 ]];then
+ echo "ERROR: upper's opaque xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+rm -rf $LOWER_DIR/*
+
+# 5.Test upper opaque direcotry cover lower directory
+echo "***** 5.Test upper opaque direcotry cover lower directory *****"
+mkdir $UPPER_DIR/testdir
+touch $LOWER_DIR/testdir
+setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
+if [[ $? -ne 0 ]];then
+ echo "ERROR: upper's opaque xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+rm -rf $LOWER_DIR/*
+
+# 6.Test lower invalid opaque directory in middle layer
+echo "***** 6.Test lower invalid opaque directory in middle layer *****"
+mkdir $LOWER_DIR/testdir0/testdir1
+setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir0/testdir1
+$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir0/testdir1
+if [[ $? -eq 0 ]];then
+ echo "ERROR: middle's opaque xattr not removed"
+ RET=$(($RET+1))
+fi
+rm -rf $LOWER_DIR/*
+
+# 7.Test lower invalid opaque directory in bottom layer
+echo "***** 7.Test lower invalid opaque directory in bottom layer *****"
+mkdir $LOWER_DIR1/testdir0/testdir1
+setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR1/testdir0/
+$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR1/testdir0/testdir1
+if [[ $? -eq 0 ]];then
+ echo "ERROR: middle's opaque xattr not removed"
+ RET=$(($RET+1))
+fi
+rm -rf $LOWER_DIR1/*
+
+# 8.Test middle opaque direcotry cover bottom directory
+echo "***** 8.Test middle opaque direcotry cover bottom directory *****"
+mkdir $LOWER_DIR1/testdir
+mkdir $LOWER_DIR/testdir
+setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir
+$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir
+if [[ $? -ne 0 ]];then
+ echo "ERROR: middle's opaque xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+rm -rf $LOWER_DIR1/*
+rm -rf $LOWER_DIR/*
+
+# 9.Test double opaque direcotry in middle and upper layer
+echo "***** 9.Test double opaque direcotry in middle and upper layer *****"
+mkdir $LOWER_DIR1/testdir
+mkdir $LOWER_DIR/testdir
+mkdir $UPPER_DIR/testdir
+setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir
+setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
+$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir
+if [[ $? -ne 0 ]];then
+ echo "ERROR: middle's opaque xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
+if [[ $? -ne 0 ]];then
+ echo "ERROR: upper's opaque xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+rm -rf $LOWER_DIR1/*
+rm -rf $LOWER_DIR/*
+rm -rf $UPPER_DIR/*
+
+__clean
+exit $RET
diff --git a/test/src/prepare.sh b/test/src/prepare.sh
new file mode 100755
index 0000000..138539a
--- /dev/null
+++ b/test/src/prepare.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+. ./local.config
+
+NOW=`date +"%Y-%m-%d-%H-%M-%S"`
+LOG_FILE=$RESULT_DIR/LOG_${NOW}.log
+RESOULT_FILE=$RESULT_DIR/RESULT_${NOW}.out
+
+# creat test base dir
+if [ ! -d "$TEST_DIR" ]; then
+ mkdir -p $TEST_DIR
+fi
+
+# creat result dir
+mkdir -p $RESULT_DIR
diff --git a/test/src/redirect_test.sh b/test/src/redirect_test.sh
new file mode 100755
index 0000000..be2ce80
--- /dev/null
+++ b/test/src/redirect_test.sh
@@ -0,0 +1,163 @@
+#!/bin/bash
+
+. ./local.config
+
+__clean()
+{
+ rm -rf $TEST_DIR/*
+ cd $PWD
+}
+
+OVL_REDIRECT_XATTR="trusted.overlay.redirect"
+OVL_OPAQUE_XATTR="trusted.overlay.opaque"
+RET=0
+
+cd $TEST_DIR
+rm -rf *
+mkdir $LOWER_DIR $LOWER_DIR1 $UPPER_DIR $WORK_DIR
+
+# 1.Test no exist redirect origin
+echo "***** 1.Test no exist redirect origin *****"
+mkdir $UPPER_DIR/testdir
+setfattr -n $OVL_REDIRECT_XATTR -v "xxx" $UPPER_DIR/testdir
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
+if [[ $? -eq 0 ]];then
+ echo "ERROR: upper's redirect xattr not remove"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+
+# 2.Test redirect origin is file
+echo "***** 2.Test redirect origin is file *****"
+mkdir $UPPER_DIR/testdir
+touch $LOWER_DIR/origin
+setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
+if [[ $? -eq 0 ]];then
+ echo "ERROR: upper's redirect xattr not remove"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+rm -rf $LOWER_DIR/*
+
+# 3.Test valid redirect xattr
+echo "***** 3.Test valid redirect xattr *****"
+mkdir $UPPER_DIR/testdir
+mknod $UPPER_DIR/origin c 0 0
+mkdir $LOWER_DIR/origin
+setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
+if [[ $? -ne 0 ]];then
+ echo "ERROR: upper's redirect xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+rm -rf $LOWER_DIR/*
+
+# 4.Test valid redirect xattr start from root
+echo "***** 4.Test valid redirect xattr start from root *****"
+mkdir -p $UPPER_DIR/testdir0/testdir1
+mknod $UPPER_DIR/origin c 0 0
+mkdir $LOWER_DIR/origin
+setfattr -n $OVL_REDIRECT_XATTR -v "/origin" $UPPER_DIR/testdir0/testdir1
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir0/testdir1
+if [[ $? -ne 0 ]];then
+ echo "ERROR: upper's redirect xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+rm -rf $LOWER_DIR/*
+
+# 5.Test missing whiteout in redirect parent directory
+echo "***** 5.Test missing whiteout in redirect parent directory *****"
+mkdir $UPPER_DIR/testdir
+mkdir $LOWER_DIR/origin
+setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
+if [[ $? -ne 0 ]];then
+ echo "ERROR: upper's redirect xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+if [ ! -e "$UPPER_DIR/origin" ];then
+ echo "ERROR: upper's missing whiteout not create"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+rm -rf $UPPER_DIR/*
+
+# 6.Test missing opaque in redirect parent directory
+echo "***** 6.Test missing opaque in redirect parent directory *****"
+mkdir -p $UPPER_DIR/testdir0/testdir1
+mkdir $UPPER_DIR/origin
+mkdir $LOWER_DIR/origin
+setfattr -n $OVL_REDIRECT_XATTR -v "/origin" $UPPER_DIR/testdir0/testdir1
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir0/testdir1
+if [[ $? -ne 0 ]];then
+ echo "ERROR: upper's redirect xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/origin
+if [[ $? -ne 0 ]];then
+ echo "ERROR: upper's missing opaque not set"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+rm -rf $LOWER_DIR/*
+
+# 7.Test duplicate redirect directory in one layer
+echo "***** 7.Test duplicate redirect directory in one layer *****"
+mkdir $UPPER_DIR/testdir0
+mkdir $UPPER_DIR/testdir1
+mknod $UPPER_DIR/origin c 0 0
+mkdir $LOWER_DIR/origin
+setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir0
+setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir1
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+if [[ $? -eq 0 ]];then
+ echo "ERROR: fsck check incorrect pass"
+ RET=$(($RET+1))
+fi
+rm -rf $UPPER_DIR/*
+rm -rf $LOWER_DIR/*
+
+# 8.Test duplicate redirect directory in different layer
+echo "***** 8.Test duplicate redirect directory in different layer *****"
+mkdir $UPPER_DIR/testdir0
+mkdir $LOWER_DIR/testdir1
+mkdir $LOWER_DIR1/origin
+setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir0
+setfattr -n $OVL_REDIRECT_XATTR -v "origin" $LOWER_DIR/testdir1
+$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
+getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir0
+if [[ $? -ne 0 ]];then
+ echo "ERROR: upper's redirect xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+getfattr -n $OVL_REDIRECT_XATTR $LOWER_DIR/testdir1
+if [[ $? -ne 0 ]];then
+ echo "ERROR: lower's redirect xattr incorrect removed"
+ RET=$(($RET+1))
+fi
+
+if [ ! -e "$LOWER_DIR/origin" ];then
+ echo "ERROR: upper's missing whiteout not create"
+ RET=$(($RET+1))
+fi
+if [ ! -e "$LOWER_DIR/origin" ];then
+ echo "ERROR: lower's missing whiteout not create"
+ RET=$(($RET+1))
+fi
+
+rm -rf $UPPER_DIR/*
+rm -rf $LOWER_DIR/*
+rm -rf $LOWER_DIR1/*
+
+__clean
+
+exit $RET
diff --git a/test/src/whiteout_test.sh b/test/src/whiteout_test.sh
new file mode 100755
index 0000000..c0e1555
--- /dev/null
+++ b/test/src/whiteout_test.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+. ./local.config
+
+__clean()
+{
+ rm -rf $TEST_DIR/*
+ cd $PWD
+}
+
+RET=0
+
+cd $TEST_DIR
+rm -rf *
+mkdir $LOWER_DIR $LOWER_DIR1 $UPPER_DIR $WORK_DIR
+
+# 1.Test lower orphan whiteout
+echo "***** 1.Test lower orphan whiteout *****"
+mknod $LOWER_DIR/foo c 0 0
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+if [ -e "$LOWER_DIR/foo" ];then
+ echo "lower's whiteout not remove"
+ RET=$(($RET+1))
+fi
+rm -f $LOWER_DIR/*
+
+# 2.Test upper orphan whiteout
+echo "***** 2.Test upper orphan whiteout *****"
+mknod $UPPER_DIR/foo c 0 0
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+if [ -e "$UPPER_DIR/foo" ];then
+ echo "upper's whiteout not remove"
+ RET=$(($RET+1))
+fi
+rm -f $UPPER_DIR/*
+
+# 3.Test upper inuse whiteout
+echo "***** 3.Test upper inuse whiteout *****"
+touch $LOWER_DIR/foo
+mknod $UPPER_DIR/foo c 0 0
+$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+if [ ! -e "$UPPER_DIR/foo" ];then
+ echo "upper's whiteout incorrect remove"
+ RET=$(($RET+1))
+fi
+rm -f $UPPER_DIR/*
+rm -f $LOWER_DIR/*
+
+# 4.Test lower inuse whiteout
+echo "***** 4.Test lower inuse whiteout *****"
+touch $LOWER_DIR/foo
+mknod $LOWER_DIR1/foo c 0 0
+$OVL_FSCK -a -l $LOWER_DIR1:$LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
+if [ ! -e "$LOWER_DIR1/foo" ];then
+ echo "lower's whiteout incorrect remove"
+ RET=$(($RET+1))
+fi
+rm -f $LOWER_DIR1/*
+rm -f $LOWER_DIR/*
+
+__clean
+
+exit $RET
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 6:47 ` [PATCH v2 01/18] overlay: implement fsck utility zhangyi (F)
@ 2017-12-14 14:13 ` Miklos Szeredi
2017-12-14 14:33 ` Amir Goldstein
2017-12-15 3:35 ` zhangyi (F)
0 siblings, 2 replies; 47+ messages in thread
From: Miklos Szeredi @ 2017-12-14 14:13 UTC (permalink / raw)
To: zhangyi (F)
Cc: linux-unionfs, fstests, Amir Goldstein, Eryu Guan,
Darrick J. Wong, miaoxie
On Thu, Dec 14, 2017 at 7:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
> fsck.overlay
> ============
>
> fsck.overlay is used to check and optionally repair underlying
> directories of overlay-filesystem.
Thanks for working on this.
>
> Check the following points:
>
> Whiteouts
> ---------
>
> A whiteout is a character device with 0/0 device number. It is used to
> record the removed files or directories, When a whiteout is found in a
> directory, there should be at least one directory or file with the same
> name in any of the corresponding lower layers. If not exist, the whiteout
> will be treated as orphan whiteout and remove.
Okay.
>
> Opaque directories
> ------------------
>
> An opaque directory is a directory with "trusted.overlay.opaque" xattr
> valued "y". There are two legal situations of making opaque directory: 1)
> create directory over whiteout 2) creat directory in merged directory. If an
> opaque directory is found, corresponding matching name in lower layers might
> exist or parent directory might merged, If not, the opaque xattr will be
> treated as invalid and remove.
Current version of overlay fs doesn't bother with removing opaque
attribute. So not sure fsck.overlay should care. Or at least is
should be an optional thing and not worth warning about, since it's
perfectly normal.
>
> Redirect directories
> --------------------
>
> An redirect directory is a directory with "trusted.overlay.redirect"
> xattr valued to the path of the original location from the root of the
> overlay. It is only used when renaming a directory and "redirect dir"
> feature is enabled. If an redirect directory is found, the following
> must be met:
>
> 1) The directory store in redirect xattr should exist in one of lower
> layers.
Okay.
> 2) The origin directory should be redirected only once in one layer,
> which mean there is only one redirect xattr point to this origin directory in
> the specified layer.
> 3) A whiteout or an opaque directory with the same name to origin should
> exist in the same directory as the redirect directory.
>
> If not, 1) The redirect xattr is invalid and need to remove 2) One of
> the redirect xattr is redundant but not sure which one is, ask user 3)
> Create a whiteout device or set opaque xattr to an existing directory if the
> parent directory was meregd or remove xattr if not.
Hmm, in this case also should ask the user, as it's not clear that the
"new" copy resulting from removal of whiteout on upper is the wanted
one or the "old" renamed copy.
>
> Usage
> =====
>
> 1. Ensure overlay filesystem is not mounted based on directories which
> need to check.
>
> 2. Run fsck.overlay program:
> Usage:
> fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
>
> Options:
> -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
> multiple lower use ':' as separator.
> -u, --upperdir=UPPERDIR specify upper directory of overlayfs
> -w, --workdir=WORKDIR specify work directory of overlayfs
Not sure what other fsck do, but I'd feel more logical to have the
same -olowerdir=..., etc. notation as for mount.
Thanks,
Miklos
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 14:13 ` Miklos Szeredi
@ 2017-12-14 14:33 ` Amir Goldstein
2017-12-14 14:47 ` Miklos Szeredi
` (2 more replies)
2017-12-15 3:35 ` zhangyi (F)
1 sibling, 3 replies; 47+ messages in thread
From: Amir Goldstein @ 2017-12-14 14:33 UTC (permalink / raw)
To: Miklos Szeredi
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Thu, Dec 14, 2017 at 4:13 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> On Thu, Dec 14, 2017 at 7:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
>> fsck.overlay
>> ============
>>
>> fsck.overlay is used to check and optionally repair underlying
>> directories of overlay-filesystem.
>
> Thanks for working on this.
>
>
>>
>> Check the following points:
>>
>> Whiteouts
>> ---------
>>
>> A whiteout is a character device with 0/0 device number. It is used to
>> record the removed files or directories, When a whiteout is found in a
>> directory, there should be at least one directory or file with the same
>> name in any of the corresponding lower layers. If not exist, the whiteout
>> will be treated as orphan whiteout and remove.
>
> Okay.
>
>>
>> Opaque directories
>> ------------------
>>
>> An opaque directory is a directory with "trusted.overlay.opaque" xattr
>> valued "y". There are two legal situations of making opaque directory: 1)
>> create directory over whiteout 2) creat directory in merged directory. If an
>> opaque directory is found, corresponding matching name in lower layers might
>> exist or parent directory might merged, If not, the opaque xattr will be
>> treated as invalid and remove.
>
> Current version of overlay fs doesn't bother with removing opaque
> attribute. So not sure fsck.overlay should care. Or at least is
> should be an optional thing and not worth warning about, since it's
> perfectly normal.
>
>
>>
>> Redirect directories
>> --------------------
>>
>> An redirect directory is a directory with "trusted.overlay.redirect"
>> xattr valued to the path of the original location from the root of the
>> overlay. It is only used when renaming a directory and "redirect dir"
>> feature is enabled. If an redirect directory is found, the following
>> must be met:
>>
>> 1) The directory store in redirect xattr should exist in one of lower
>> layers.
>
> Okay.
>
>> 2) The origin directory should be redirected only once in one layer,
>> which mean there is only one redirect xattr point to this origin directory in
>> the specified layer.
>> 3) A whiteout or an opaque directory with the same name to origin should
>> exist in the same directory as the redirect directory.
>>
>> If not, 1) The redirect xattr is invalid and need to remove 2) One of
>> the redirect xattr is redundant but not sure which one is, ask user 3)
>> Create a whiteout device or set opaque xattr to an existing directory if the
>> parent directory was meregd or remove xattr if not.
>
> Hmm, in this case also should ask the user, as it's not clear that the
> "new" copy resulting from removal of whiteout on upper is the wanted
> one or the "old" renamed copy.
>
>
>>
>> Usage
>> =====
>>
>> 1. Ensure overlay filesystem is not mounted based on directories which
>> need to check.
>>
>> 2. Run fsck.overlay program:
>> Usage:
>> fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
>>
>> Options:
>> -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
>> multiple lower use ':' as separator.
>> -u, --upperdir=UPPERDIR specify upper directory of overlayfs
>> -w, --workdir=WORKDIR specify work directory of overlayfs
>
> Not sure what other fsck do, but I'd feel more logical to have the
> same -olowerdir=..., etc. notation as for mount.
>
Other fsck do not have this problem.
They only need blockdev as input.
Which leads me to an idea I have been wondering about for the overlayfs
utilities - a specification file, e.g.:
# create dirs and write their path to a spec file:
mkfs.overlay -ometacopy=on,lowerdir=... myovl.spec
# mount overlay using mount.overlay helper:
mount -t overlay myovl.spec /ovl
# fsck with just one configuration that is consistent with mkfs and mount:
fsck.overlay -n myovl.spec
The specification file can also determine the backward incompatible
features of the overlay, for example, if user sets -metacopy=on during mkfs
mount.overlay helper will refuse to mount with kernel that does not
support metacopy. The reason we CAN do that with spec file is because spec
file determines that overlay was born with metacopy feature enabled.
It is not the same an overlay that was once mounted with metacopy=on and
then we don't allow it to mount with an old kernel.
This method could delegate the entire feature compatibility to userspace
mount helper.
Another nice thing about mount.overlay helper is that it could abstarct
away the move from mount() to mount2() when the time comes and then
users can keep using existing tools but won't have the existing limit on
number of lowerdirs.
Thoughts?
Amir.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 14:33 ` Amir Goldstein
@ 2017-12-14 14:47 ` Miklos Szeredi
2017-12-14 15:03 ` Amir Goldstein
2017-12-14 15:21 ` Vivek Goyal
2017-12-15 4:18 ` zhangyi (F)
2 siblings, 1 reply; 47+ messages in thread
From: Miklos Szeredi @ 2017-12-14 14:47 UTC (permalink / raw)
To: Amir Goldstein
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Thu, Dec 14, 2017 at 3:33 PM, Amir Goldstein <amir73il@gmail.com> wrote:
> On Thu, Dec 14, 2017 at 4:13 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>> On Thu, Dec 14, 2017 at 7:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
>>> fsck.overlay
>>> ============
>>>
>>> fsck.overlay is used to check and optionally repair underlying
>>> directories of overlay-filesystem.
>>
>> Thanks for working on this.
>>
>>
>>>
>>> Check the following points:
>>>
>>> Whiteouts
>>> ---------
>>>
>>> A whiteout is a character device with 0/0 device number. It is used to
>>> record the removed files or directories, When a whiteout is found in a
>>> directory, there should be at least one directory or file with the same
>>> name in any of the corresponding lower layers. If not exist, the whiteout
>>> will be treated as orphan whiteout and remove.
>>
>> Okay.
>>
>>>
>>> Opaque directories
>>> ------------------
>>>
>>> An opaque directory is a directory with "trusted.overlay.opaque" xattr
>>> valued "y". There are two legal situations of making opaque directory: 1)
>>> create directory over whiteout 2) creat directory in merged directory. If an
>>> opaque directory is found, corresponding matching name in lower layers might
>>> exist or parent directory might merged, If not, the opaque xattr will be
>>> treated as invalid and remove.
>>
>> Current version of overlay fs doesn't bother with removing opaque
>> attribute. So not sure fsck.overlay should care. Or at least is
>> should be an optional thing and not worth warning about, since it's
>> perfectly normal.
>>
>>
>>>
>>> Redirect directories
>>> --------------------
>>>
>>> An redirect directory is a directory with "trusted.overlay.redirect"
>>> xattr valued to the path of the original location from the root of the
>>> overlay. It is only used when renaming a directory and "redirect dir"
>>> feature is enabled. If an redirect directory is found, the following
>>> must be met:
>>>
>>> 1) The directory store in redirect xattr should exist in one of lower
>>> layers.
>>
>> Okay.
>>
>>> 2) The origin directory should be redirected only once in one layer,
>>> which mean there is only one redirect xattr point to this origin directory in
>>> the specified layer.
>>> 3) A whiteout or an opaque directory with the same name to origin should
>>> exist in the same directory as the redirect directory.
>>>
>>> If not, 1) The redirect xattr is invalid and need to remove 2) One of
>>> the redirect xattr is redundant but not sure which one is, ask user 3)
>>> Create a whiteout device or set opaque xattr to an existing directory if the
>>> parent directory was meregd or remove xattr if not.
>>
>> Hmm, in this case also should ask the user, as it's not clear that the
>> "new" copy resulting from removal of whiteout on upper is the wanted
>> one or the "old" renamed copy.
>>
>>
>>>
>>> Usage
>>> =====
>>>
>>> 1. Ensure overlay filesystem is not mounted based on directories which
>>> need to check.
>>>
>>> 2. Run fsck.overlay program:
>>> Usage:
>>> fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
>>>
>>> Options:
>>> -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
>>> multiple lower use ':' as separator.
>>> -u, --upperdir=UPPERDIR specify upper directory of overlayfs
>>> -w, --workdir=WORKDIR specify work directory of overlayfs
>>
>> Not sure what other fsck do, but I'd feel more logical to have the
>> same -olowerdir=..., etc. notation as for mount.
>>
>
> Other fsck do not have this problem.
> They only need blockdev as input.
> Which leads me to an idea I have been wondering about for the overlayfs
> utilities - a specification file, e.g.:
>
> # create dirs and write their path to a spec file:
> mkfs.overlay -ometacopy=on,lowerdir=... myovl.spec
> # mount overlay using mount.overlay helper:
> mount -t overlay myovl.spec /ovl
> # fsck with just one configuration that is consistent with mkfs and mount:
> fsck.overlay -n myovl.spec
>
> The specification file can also determine the backward incompatible
> features of the overlay, for example, if user sets -metacopy=on during mkfs
> mount.overlay helper will refuse to mount with kernel that does not
> support metacopy. The reason we CAN do that with spec file is because spec
> file determines that overlay was born with metacopy feature enabled.
> It is not the same an overlay that was once mounted with metacopy=on and
> then we don't allow it to mount with an old kernel.
>
> This method could delegate the entire feature compatibility to userspace
> mount helper.
Would be nice.
Somewhat related: overlay.fsck could allow converting to a more
compatible format (e.g. remove metacopy, redirect, index, etc).
Thanks,
Miklos
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 14:47 ` Miklos Szeredi
@ 2017-12-14 15:03 ` Amir Goldstein
2017-12-14 15:10 ` Miklos Szeredi
0 siblings, 1 reply; 47+ messages in thread
From: Amir Goldstein @ 2017-12-14 15:03 UTC (permalink / raw)
To: Miklos Szeredi
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Thu, Dec 14, 2017 at 4:47 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> On Thu, Dec 14, 2017 at 3:33 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>> On Thu, Dec 14, 2017 at 4:13 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>>> On Thu, Dec 14, 2017 at 7:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
>>>> fsck.overlay
>>>> ============
>>>>
>>>> fsck.overlay is used to check and optionally repair underlying
>>>> directories of overlay-filesystem.
>>>
>>> Thanks for working on this.
>>>
>>>
>>>>
>>>> Check the following points:
>>>>
>>>> Whiteouts
>>>> ---------
>>>>
>>>> A whiteout is a character device with 0/0 device number. It is used to
>>>> record the removed files or directories, When a whiteout is found in a
>>>> directory, there should be at least one directory or file with the same
>>>> name in any of the corresponding lower layers. If not exist, the whiteout
>>>> will be treated as orphan whiteout and remove.
>>>
>>> Okay.
>>>
>>>>
>>>> Opaque directories
>>>> ------------------
>>>>
>>>> An opaque directory is a directory with "trusted.overlay.opaque" xattr
>>>> valued "y". There are two legal situations of making opaque directory: 1)
>>>> create directory over whiteout 2) creat directory in merged directory. If an
>>>> opaque directory is found, corresponding matching name in lower layers might
>>>> exist or parent directory might merged, If not, the opaque xattr will be
>>>> treated as invalid and remove.
>>>
>>> Current version of overlay fs doesn't bother with removing opaque
>>> attribute. So not sure fsck.overlay should care. Or at least is
>>> should be an optional thing and not worth warning about, since it's
>>> perfectly normal.
>>>
>>>
>>>>
>>>> Redirect directories
>>>> --------------------
>>>>
>>>> An redirect directory is a directory with "trusted.overlay.redirect"
>>>> xattr valued to the path of the original location from the root of the
>>>> overlay. It is only used when renaming a directory and "redirect dir"
>>>> feature is enabled. If an redirect directory is found, the following
>>>> must be met:
>>>>
>>>> 1) The directory store in redirect xattr should exist in one of lower
>>>> layers.
>>>
>>> Okay.
>>>
>>>> 2) The origin directory should be redirected only once in one layer,
>>>> which mean there is only one redirect xattr point to this origin directory in
>>>> the specified layer.
>>>> 3) A whiteout or an opaque directory with the same name to origin should
>>>> exist in the same directory as the redirect directory.
>>>>
>>>> If not, 1) The redirect xattr is invalid and need to remove 2) One of
>>>> the redirect xattr is redundant but not sure which one is, ask user 3)
>>>> Create a whiteout device or set opaque xattr to an existing directory if the
>>>> parent directory was meregd or remove xattr if not.
>>>
>>> Hmm, in this case also should ask the user, as it's not clear that the
>>> "new" copy resulting from removal of whiteout on upper is the wanted
>>> one or the "old" renamed copy.
>>>
>>>
>>>>
>>>> Usage
>>>> =====
>>>>
>>>> 1. Ensure overlay filesystem is not mounted based on directories which
>>>> need to check.
>>>>
>>>> 2. Run fsck.overlay program:
>>>> Usage:
>>>> fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
>>>>
>>>> Options:
>>>> -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
>>>> multiple lower use ':' as separator.
>>>> -u, --upperdir=UPPERDIR specify upper directory of overlayfs
>>>> -w, --workdir=WORKDIR specify work directory of overlayfs
>>>
>>> Not sure what other fsck do, but I'd feel more logical to have the
>>> same -olowerdir=..., etc. notation as for mount.
>>>
>>
>> Other fsck do not have this problem.
>> They only need blockdev as input.
>> Which leads me to an idea I have been wondering about for the overlayfs
>> utilities - a specification file, e.g.:
>>
>> # create dirs and write their path to a spec file:
>> mkfs.overlay -ometacopy=on,lowerdir=... myovl.spec
>> # mount overlay using mount.overlay helper:
>> mount -t overlay myovl.spec /ovl
>> # fsck with just one configuration that is consistent with mkfs and mount:
>> fsck.overlay -n myovl.spec
>>
>> The specification file can also determine the backward incompatible
>> features of the overlay, for example, if user sets -metacopy=on during mkfs
>> mount.overlay helper will refuse to mount with kernel that does not
>> support metacopy. The reason we CAN do that with spec file is because spec
>> file determines that overlay was born with metacopy feature enabled.
>> It is not the same an overlay that was once mounted with metacopy=on and
>> then we don't allow it to mount with an old kernel.
>>
>> This method could delegate the entire feature compatibility to userspace
>> mount helper.
>
> Would be nice.
>
> Somewhat related: overlay.fsck could allow converting to a more
> compatible format (e.g. remove metacopy, redirect, index, etc).
>
Yeh, or another tool. I was thinking more in the lines of a export/import to
a portable format. Docker knows to pack opaque xattr, but it doesn't pack
"redirect" xattr to images these days, not to mention "origin" and index.
incompatible features can be either stripped off at export time, or stripped
off at import time based on capabilities of the kernel where overlay is imported
on.
Amir.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 15:03 ` Amir Goldstein
@ 2017-12-14 15:10 ` Miklos Szeredi
2017-12-14 15:18 ` Amir Goldstein
0 siblings, 1 reply; 47+ messages in thread
From: Miklos Szeredi @ 2017-12-14 15:10 UTC (permalink / raw)
To: Amir Goldstein
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Thu, Dec 14, 2017 at 4:03 PM, Amir Goldstein <amir73il@gmail.com> wrote:
> On Thu, Dec 14, 2017 at 4:47 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>> On Thu, Dec 14, 2017 at 3:33 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>>> On Thu, Dec 14, 2017 at 4:13 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>>>> On Thu, Dec 14, 2017 at 7:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
>>>>> fsck.overlay
>>>>> ============
>>>>>
>>>>> fsck.overlay is used to check and optionally repair underlying
>>>>> directories of overlay-filesystem.
>>>>
>>>> Thanks for working on this.
>>>>
>>>>
>>>>>
>>>>> Check the following points:
>>>>>
>>>>> Whiteouts
>>>>> ---------
>>>>>
>>>>> A whiteout is a character device with 0/0 device number. It is used to
>>>>> record the removed files or directories, When a whiteout is found in a
>>>>> directory, there should be at least one directory or file with the same
>>>>> name in any of the corresponding lower layers. If not exist, the whiteout
>>>>> will be treated as orphan whiteout and remove.
>>>>
>>>> Okay.
>>>>
>>>>>
>>>>> Opaque directories
>>>>> ------------------
>>>>>
>>>>> An opaque directory is a directory with "trusted.overlay.opaque" xattr
>>>>> valued "y". There are two legal situations of making opaque directory: 1)
>>>>> create directory over whiteout 2) creat directory in merged directory. If an
>>>>> opaque directory is found, corresponding matching name in lower layers might
>>>>> exist or parent directory might merged, If not, the opaque xattr will be
>>>>> treated as invalid and remove.
>>>>
>>>> Current version of overlay fs doesn't bother with removing opaque
>>>> attribute. So not sure fsck.overlay should care. Or at least is
>>>> should be an optional thing and not worth warning about, since it's
>>>> perfectly normal.
>>>>
>>>>
>>>>>
>>>>> Redirect directories
>>>>> --------------------
>>>>>
>>>>> An redirect directory is a directory with "trusted.overlay.redirect"
>>>>> xattr valued to the path of the original location from the root of the
>>>>> overlay. It is only used when renaming a directory and "redirect dir"
>>>>> feature is enabled. If an redirect directory is found, the following
>>>>> must be met:
>>>>>
>>>>> 1) The directory store in redirect xattr should exist in one of lower
>>>>> layers.
>>>>
>>>> Okay.
>>>>
>>>>> 2) The origin directory should be redirected only once in one layer,
>>>>> which mean there is only one redirect xattr point to this origin directory in
>>>>> the specified layer.
>>>>> 3) A whiteout or an opaque directory with the same name to origin should
>>>>> exist in the same directory as the redirect directory.
>>>>>
>>>>> If not, 1) The redirect xattr is invalid and need to remove 2) One of
>>>>> the redirect xattr is redundant but not sure which one is, ask user 3)
>>>>> Create a whiteout device or set opaque xattr to an existing directory if the
>>>>> parent directory was meregd or remove xattr if not.
>>>>
>>>> Hmm, in this case also should ask the user, as it's not clear that the
>>>> "new" copy resulting from removal of whiteout on upper is the wanted
>>>> one or the "old" renamed copy.
>>>>
>>>>
>>>>>
>>>>> Usage
>>>>> =====
>>>>>
>>>>> 1. Ensure overlay filesystem is not mounted based on directories which
>>>>> need to check.
>>>>>
>>>>> 2. Run fsck.overlay program:
>>>>> Usage:
>>>>> fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
>>>>>
>>>>> Options:
>>>>> -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
>>>>> multiple lower use ':' as separator.
>>>>> -u, --upperdir=UPPERDIR specify upper directory of overlayfs
>>>>> -w, --workdir=WORKDIR specify work directory of overlayfs
>>>>
>>>> Not sure what other fsck do, but I'd feel more logical to have the
>>>> same -olowerdir=..., etc. notation as for mount.
>>>>
>>>
>>> Other fsck do not have this problem.
>>> They only need blockdev as input.
>>> Which leads me to an idea I have been wondering about for the overlayfs
>>> utilities - a specification file, e.g.:
>>>
>>> # create dirs and write their path to a spec file:
>>> mkfs.overlay -ometacopy=on,lowerdir=... myovl.spec
>>> # mount overlay using mount.overlay helper:
>>> mount -t overlay myovl.spec /ovl
>>> # fsck with just one configuration that is consistent with mkfs and mount:
>>> fsck.overlay -n myovl.spec
>>>
>>> The specification file can also determine the backward incompatible
>>> features of the overlay, for example, if user sets -metacopy=on during mkfs
>>> mount.overlay helper will refuse to mount with kernel that does not
>>> support metacopy. The reason we CAN do that with spec file is because spec
>>> file determines that overlay was born with metacopy feature enabled.
>>> It is not the same an overlay that was once mounted with metacopy=on and
>>> then we don't allow it to mount with an old kernel.
>>>
>>> This method could delegate the entire feature compatibility to userspace
>>> mount helper.
>>
>> Would be nice.
>>
>> Somewhat related: overlay.fsck could allow converting to a more
>> compatible format (e.g. remove metacopy, redirect, index, etc).
>>
>
> Yeh, or another tool. I was thinking more in the lines of a export/import to
> a portable format.
tar?
> Docker knows to pack opaque xattr, but it doesn't pack
> "redirect" xattr to images these days, not to mention "origin" and index.
>
> incompatible features can be either stripped off at export time, or stripped
> off at import time based on capabilities of the kernel where overlay is imported
> on.
Right.
Thanks,
Miklos
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 15:10 ` Miklos Szeredi
@ 2017-12-14 15:18 ` Amir Goldstein
2017-12-14 15:48 ` Miklos Szeredi
0 siblings, 1 reply; 47+ messages in thread
From: Amir Goldstein @ 2017-12-14 15:18 UTC (permalink / raw)
To: Miklos Szeredi
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Thu, Dec 14, 2017 at 5:10 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> On Thu, Dec 14, 2017 at 4:03 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>> On Thu, Dec 14, 2017 at 4:47 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>>> On Thu, Dec 14, 2017 at 3:33 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>>>> On Thu, Dec 14, 2017 at 4:13 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>>>>> On Thu, Dec 14, 2017 at 7:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
>>>>>> fsck.overlay
>>>>>> ============
>>>>>>
>>>>>> fsck.overlay is used to check and optionally repair underlying
>>>>>> directories of overlay-filesystem.
>>>>>
>>>>> Thanks for working on this.
>>>>>
>>>>>
>>>>>>
>>>>>> Check the following points:
>>>>>>
>>>>>> Whiteouts
>>>>>> ---------
>>>>>>
>>>>>> A whiteout is a character device with 0/0 device number. It is used to
>>>>>> record the removed files or directories, When a whiteout is found in a
>>>>>> directory, there should be at least one directory or file with the same
>>>>>> name in any of the corresponding lower layers. If not exist, the whiteout
>>>>>> will be treated as orphan whiteout and remove.
>>>>>
>>>>> Okay.
>>>>>
>>>>>>
>>>>>> Opaque directories
>>>>>> ------------------
>>>>>>
>>>>>> An opaque directory is a directory with "trusted.overlay.opaque" xattr
>>>>>> valued "y". There are two legal situations of making opaque directory: 1)
>>>>>> create directory over whiteout 2) creat directory in merged directory. If an
>>>>>> opaque directory is found, corresponding matching name in lower layers might
>>>>>> exist or parent directory might merged, If not, the opaque xattr will be
>>>>>> treated as invalid and remove.
>>>>>
>>>>> Current version of overlay fs doesn't bother with removing opaque
>>>>> attribute. So not sure fsck.overlay should care. Or at least is
>>>>> should be an optional thing and not worth warning about, since it's
>>>>> perfectly normal.
>>>>>
>>>>>
>>>>>>
>>>>>> Redirect directories
>>>>>> --------------------
>>>>>>
>>>>>> An redirect directory is a directory with "trusted.overlay.redirect"
>>>>>> xattr valued to the path of the original location from the root of the
>>>>>> overlay. It is only used when renaming a directory and "redirect dir"
>>>>>> feature is enabled. If an redirect directory is found, the following
>>>>>> must be met:
>>>>>>
>>>>>> 1) The directory store in redirect xattr should exist in one of lower
>>>>>> layers.
>>>>>
>>>>> Okay.
>>>>>
>>>>>> 2) The origin directory should be redirected only once in one layer,
>>>>>> which mean there is only one redirect xattr point to this origin directory in
>>>>>> the specified layer.
>>>>>> 3) A whiteout or an opaque directory with the same name to origin should
>>>>>> exist in the same directory as the redirect directory.
>>>>>>
>>>>>> If not, 1) The redirect xattr is invalid and need to remove 2) One of
>>>>>> the redirect xattr is redundant but not sure which one is, ask user 3)
>>>>>> Create a whiteout device or set opaque xattr to an existing directory if the
>>>>>> parent directory was meregd or remove xattr if not.
>>>>>
>>>>> Hmm, in this case also should ask the user, as it's not clear that the
>>>>> "new" copy resulting from removal of whiteout on upper is the wanted
>>>>> one or the "old" renamed copy.
>>>>>
>>>>>
>>>>>>
>>>>>> Usage
>>>>>> =====
>>>>>>
>>>>>> 1. Ensure overlay filesystem is not mounted based on directories which
>>>>>> need to check.
>>>>>>
>>>>>> 2. Run fsck.overlay program:
>>>>>> Usage:
>>>>>> fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
>>>>>>
>>>>>> Options:
>>>>>> -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
>>>>>> multiple lower use ':' as separator.
>>>>>> -u, --upperdir=UPPERDIR specify upper directory of overlayfs
>>>>>> -w, --workdir=WORKDIR specify work directory of overlayfs
>>>>>
>>>>> Not sure what other fsck do, but I'd feel more logical to have the
>>>>> same -olowerdir=..., etc. notation as for mount.
>>>>>
>>>>
>>>> Other fsck do not have this problem.
>>>> They only need blockdev as input.
>>>> Which leads me to an idea I have been wondering about for the overlayfs
>>>> utilities - a specification file, e.g.:
>>>>
>>>> # create dirs and write their path to a spec file:
>>>> mkfs.overlay -ometacopy=on,lowerdir=... myovl.spec
>>>> # mount overlay using mount.overlay helper:
>>>> mount -t overlay myovl.spec /ovl
>>>> # fsck with just one configuration that is consistent with mkfs and mount:
>>>> fsck.overlay -n myovl.spec
>>>>
>>>> The specification file can also determine the backward incompatible
>>>> features of the overlay, for example, if user sets -metacopy=on during mkfs
>>>> mount.overlay helper will refuse to mount with kernel that does not
>>>> support metacopy. The reason we CAN do that with spec file is because spec
>>>> file determines that overlay was born with metacopy feature enabled.
>>>> It is not the same an overlay that was once mounted with metacopy=on and
>>>> then we don't allow it to mount with an old kernel.
>>>>
>>>> This method could delegate the entire feature compatibility to userspace
>>>> mount helper.
>>>
>>> Would be nice.
>>>
>>> Somewhat related: overlay.fsck could allow converting to a more
>>> compatible format (e.g. remove metacopy, redirect, index, etc).
>>>
>>
>> Yeh, or another tool. I was thinking more in the lines of a export/import to
>> a portable format.
>
> tar?
>
Yes :) Docker uses tar alright.
But for example "origin" xattr cannot be exported as is to a portable format.
Need to decode file handles during export and change them to "redirect"
for directories and possible to "redirect" for files as well, that
would be converted
back to "origin" on import.
Exporting index is a challenge for the same reason and also because tar can
break hardlinks on extract. Probably index should be rebuilt from scratch on
import, based on "redirect".
Amir.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 15:18 ` Amir Goldstein
@ 2017-12-14 15:48 ` Miklos Szeredi
2017-12-14 16:03 ` Vivek Goyal
2017-12-14 16:29 ` Amir Goldstein
0 siblings, 2 replies; 47+ messages in thread
From: Miklos Szeredi @ 2017-12-14 15:48 UTC (permalink / raw)
To: Amir Goldstein
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Thu, Dec 14, 2017 at 4:18 PM, Amir Goldstein <amir73il@gmail.com> wrote:
> On Thu, Dec 14, 2017 at 5:10 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>> On Thu, Dec 14, 2017 at 4:03 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>>> On Thu, Dec 14, 2017 at 4:47 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>>>> On Thu, Dec 14, 2017 at 3:33 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>>>>> On Thu, Dec 14, 2017 at 4:13 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>>>>>> On Thu, Dec 14, 2017 at 7:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
>>>>>>> fsck.overlay
>>>>>>> ============
>>>>>>>
>>>>>>> fsck.overlay is used to check and optionally repair underlying
>>>>>>> directories of overlay-filesystem.
>>>>>>
>>>>>> Thanks for working on this.
>>>>>>
>>>>>>
>>>>>>>
>>>>>>> Check the following points:
>>>>>>>
>>>>>>> Whiteouts
>>>>>>> ---------
>>>>>>>
>>>>>>> A whiteout is a character device with 0/0 device number. It is used to
>>>>>>> record the removed files or directories, When a whiteout is found in a
>>>>>>> directory, there should be at least one directory or file with the same
>>>>>>> name in any of the corresponding lower layers. If not exist, the whiteout
>>>>>>> will be treated as orphan whiteout and remove.
>>>>>>
>>>>>> Okay.
>>>>>>
>>>>>>>
>>>>>>> Opaque directories
>>>>>>> ------------------
>>>>>>>
>>>>>>> An opaque directory is a directory with "trusted.overlay.opaque" xattr
>>>>>>> valued "y". There are two legal situations of making opaque directory: 1)
>>>>>>> create directory over whiteout 2) creat directory in merged directory. If an
>>>>>>> opaque directory is found, corresponding matching name in lower layers might
>>>>>>> exist or parent directory might merged, If not, the opaque xattr will be
>>>>>>> treated as invalid and remove.
>>>>>>
>>>>>> Current version of overlay fs doesn't bother with removing opaque
>>>>>> attribute. So not sure fsck.overlay should care. Or at least is
>>>>>> should be an optional thing and not worth warning about, since it's
>>>>>> perfectly normal.
>>>>>>
>>>>>>
>>>>>>>
>>>>>>> Redirect directories
>>>>>>> --------------------
>>>>>>>
>>>>>>> An redirect directory is a directory with "trusted.overlay.redirect"
>>>>>>> xattr valued to the path of the original location from the root of the
>>>>>>> overlay. It is only used when renaming a directory and "redirect dir"
>>>>>>> feature is enabled. If an redirect directory is found, the following
>>>>>>> must be met:
>>>>>>>
>>>>>>> 1) The directory store in redirect xattr should exist in one of lower
>>>>>>> layers.
>>>>>>
>>>>>> Okay.
>>>>>>
>>>>>>> 2) The origin directory should be redirected only once in one layer,
>>>>>>> which mean there is only one redirect xattr point to this origin directory in
>>>>>>> the specified layer.
>>>>>>> 3) A whiteout or an opaque directory with the same name to origin should
>>>>>>> exist in the same directory as the redirect directory.
>>>>>>>
>>>>>>> If not, 1) The redirect xattr is invalid and need to remove 2) One of
>>>>>>> the redirect xattr is redundant but not sure which one is, ask user 3)
>>>>>>> Create a whiteout device or set opaque xattr to an existing directory if the
>>>>>>> parent directory was meregd or remove xattr if not.
>>>>>>
>>>>>> Hmm, in this case also should ask the user, as it's not clear that the
>>>>>> "new" copy resulting from removal of whiteout on upper is the wanted
>>>>>> one or the "old" renamed copy.
>>>>>>
>>>>>>
>>>>>>>
>>>>>>> Usage
>>>>>>> =====
>>>>>>>
>>>>>>> 1. Ensure overlay filesystem is not mounted based on directories which
>>>>>>> need to check.
>>>>>>>
>>>>>>> 2. Run fsck.overlay program:
>>>>>>> Usage:
>>>>>>> fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
>>>>>>>
>>>>>>> Options:
>>>>>>> -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
>>>>>>> multiple lower use ':' as separator.
>>>>>>> -u, --upperdir=UPPERDIR specify upper directory of overlayfs
>>>>>>> -w, --workdir=WORKDIR specify work directory of overlayfs
>>>>>>
>>>>>> Not sure what other fsck do, but I'd feel more logical to have the
>>>>>> same -olowerdir=..., etc. notation as for mount.
>>>>>>
>>>>>
>>>>> Other fsck do not have this problem.
>>>>> They only need blockdev as input.
>>>>> Which leads me to an idea I have been wondering about for the overlayfs
>>>>> utilities - a specification file, e.g.:
>>>>>
>>>>> # create dirs and write their path to a spec file:
>>>>> mkfs.overlay -ometacopy=on,lowerdir=... myovl.spec
>>>>> # mount overlay using mount.overlay helper:
>>>>> mount -t overlay myovl.spec /ovl
>>>>> # fsck with just one configuration that is consistent with mkfs and mount:
>>>>> fsck.overlay -n myovl.spec
>>>>>
>>>>> The specification file can also determine the backward incompatible
>>>>> features of the overlay, for example, if user sets -metacopy=on during mkfs
>>>>> mount.overlay helper will refuse to mount with kernel that does not
>>>>> support metacopy. The reason we CAN do that with spec file is because spec
>>>>> file determines that overlay was born with metacopy feature enabled.
>>>>> It is not the same an overlay that was once mounted with metacopy=on and
>>>>> then we don't allow it to mount with an old kernel.
>>>>>
>>>>> This method could delegate the entire feature compatibility to userspace
>>>>> mount helper.
>>>>
>>>> Would be nice.
>>>>
>>>> Somewhat related: overlay.fsck could allow converting to a more
>>>> compatible format (e.g. remove metacopy, redirect, index, etc).
>>>>
>>>
>>> Yeh, or another tool. I was thinking more in the lines of a export/import to
>>> a portable format.
>>
>> tar?
>>
>
> Yes :) Docker uses tar alright.
> But for example "origin" xattr cannot be exported as is to a portable format.
> Need to decode file handles during export and change them to "redirect"
> for directories and possible to "redirect" for files as well, that
> would be converted
> back to "origin" on import.
Is it worth preserving origin for non-hardlinks? Same story as "cp
-a", inode numbers will change, so there doesn't appear to be a reason
to preserve the connection between origin and the copied up file.
> Exporting index is a challenge for the same reason and also because tar can
> break hardlinks on extract. Probably index should be rebuilt from scratch on
> import, based on "redirect".
Yes, hard links need special handling, so will metacopy. Might be
worth adding "redirect" to hard links and metacopy to make this issue
less of a problem.
Thanks,
Miklos
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 15:48 ` Miklos Szeredi
@ 2017-12-14 16:03 ` Vivek Goyal
2017-12-14 16:29 ` Amir Goldstein
1 sibling, 0 replies; 47+ messages in thread
From: Vivek Goyal @ 2017-12-14 16:03 UTC (permalink / raw)
To: Miklos Szeredi
Cc: Amir Goldstein, zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie
On Thu, Dec 14, 2017 at 04:48:33PM +0100, Miklos Szeredi wrote:
[..]
> Is it worth preserving origin for non-hardlinks?
I think metadata copy-up feature is one candidate which will require
preserving origin for non-hardlinks.
Vivek
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 15:48 ` Miklos Szeredi
2017-12-14 16:03 ` Vivek Goyal
@ 2017-12-14 16:29 ` Amir Goldstein
2017-12-15 14:18 ` Miklos Szeredi
1 sibling, 1 reply; 47+ messages in thread
From: Amir Goldstein @ 2017-12-14 16:29 UTC (permalink / raw)
To: Miklos Szeredi
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Thu, Dec 14, 2017 at 5:48 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> On Thu, Dec 14, 2017 at 4:18 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>> On Thu, Dec 14, 2017 at 5:10 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
[...]
>> Yes :) Docker uses tar alright.
>> But for example "origin" xattr cannot be exported as is to a portable format.
>> Need to decode file handles during export and change them to "redirect"
>> for directories and possible to "redirect" for files as well, that
>> would be converted
>> back to "origin" on import.
>
> Is it worth preserving origin for non-hardlinks? Same story as "cp
> -a", inode numbers will change, so there doesn't appear to be a reason
> to preserve the connection between origin and the copied up file.
Besides metacopy, no reason.
>
>> Exporting index is a challenge for the same reason and also because tar can
>> break hardlinks on extract. Probably index should be rebuilt from scratch on
>> import, based on "redirect".
>
> Yes, hard links need special handling, so will metacopy. Might be
> worth adding "redirect" to hard links and metacopy to make this issue
> less of a problem.
>
Do you mean add it now in kernel? hmm, that's just another thing that
can become inconsistent, so I don't see the immediate value.
Which reminds me, you did not provide feedback to the patch I posted
to detect duplicate redirect dir use case:
https://marc.info/?l=linux-unionfs&m=151126880100432&w=2
Do you consider this a bug that should be detected by overlayfs
as patch proposed or leave it to be detected only when enabling
opt-in directory indexing (named verify=on in current WIP patches)?
Also waiting for your feedback about merging the duplicate redirect dir
test case to xfstests:
https://marc.info/?l=fstests&m=151149994629687&w=2
Bug or not bug?
Thanks,
Amir.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 16:29 ` Amir Goldstein
@ 2017-12-15 14:18 ` Miklos Szeredi
2017-12-15 14:44 ` Amir Goldstein
2017-12-15 15:16 ` Vivek Goyal
0 siblings, 2 replies; 47+ messages in thread
From: Miklos Szeredi @ 2017-12-15 14:18 UTC (permalink / raw)
To: Amir Goldstein
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Thu, Dec 14, 2017 at 5:29 PM, Amir Goldstein <amir73il@gmail.com> wrote:
> On Thu, Dec 14, 2017 at 5:48 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>> On Thu, Dec 14, 2017 at 4:18 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>>> On Thu, Dec 14, 2017 at 5:10 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> [...]
>>> Yes :) Docker uses tar alright.
>>> But for example "origin" xattr cannot be exported as is to a portable format.
>>> Need to decode file handles during export and change them to "redirect"
>>> for directories and possible to "redirect" for files as well, that
>>> would be converted
>>> back to "origin" on import.
>>
>> Is it worth preserving origin for non-hardlinks? Same story as "cp
>> -a", inode numbers will change, so there doesn't appear to be a reason
>> to preserve the connection between origin and the copied up file.
>
> Besides metacopy, no reason.
>
>>
>>> Exporting index is a challenge for the same reason and also because tar can
>>> break hardlinks on extract. Probably index should be rebuilt from scratch on
>>> import, based on "redirect".
>>
>> Yes, hard links need special handling, so will metacopy. Might be
>> worth adding "redirect" to hard links and metacopy to make this issue
>> less of a problem.
>>
>
> Do you mean add it now in kernel? hmm, that's just another thing that
> can become inconsistent, so I don't see the immediate value.
The immediate value is that no need for a special pack/unpack tool for
transferring the overlay "image".
>
> Which reminds me, you did not provide feedback to the patch I posted
> to detect duplicate redirect dir use case:
>
> https://marc.info/?l=linux-unionfs&m=151126880100432&w=2
>
> Do you consider this a bug that should be detected by overlayfs
> as patch proposed or leave it to be detected only when enabling
> opt-in directory indexing (named verify=on in current WIP patches)?
>
> Also waiting for your feedback about merging the duplicate redirect dir
> test case to xfstests:
> https://marc.info/?l=fstests&m=151149994629687&w=2
>
> Bug or not bug?
Hmm... I'd lean towards non-bug. That "offline modification is
allowed" rule should point out caveats when messing with overlay
specific attributes (opaque, whiteout, redirect, etc). Obviously
having two redirects pointing to the same underlying dir is going to
result in inconsistencies. We can get away with it without constant
ino, but I don't think it makes sense to allow that construct.
Thanks,
Miklos
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-15 14:18 ` Miklos Szeredi
@ 2017-12-15 14:44 ` Amir Goldstein
2017-12-15 16:06 ` Miklos Szeredi
2017-12-15 15:16 ` Vivek Goyal
1 sibling, 1 reply; 47+ messages in thread
From: Amir Goldstein @ 2017-12-15 14:44 UTC (permalink / raw)
To: Miklos Szeredi
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Fri, Dec 15, 2017 at 4:18 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> On Thu, Dec 14, 2017 at 5:29 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>> On Thu, Dec 14, 2017 at 5:48 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
[...]
>>>
>>>> Exporting index is a challenge for the same reason and also because tar can
>>>> break hardlinks on extract. Probably index should be rebuilt from scratch on
>>>> import, based on "redirect".
>>>
>>> Yes, hard links need special handling, so will metacopy. Might be
>>> worth adding "redirect" to hard links and metacopy to make this issue
>>> less of a problem.
>>>
>>
>> Do you mean add it now in kernel? hmm, that's just another thing that
>> can become inconsistent, so I don't see the immediate value.
>
> The immediate value is that no need for a special pack/unpack tool for
> transferring the overlay "image".
>
OK, but I don't see how we can escape unpack tool for rebuilding the index
from redirects.
Do you mean that you want to also follow non-dir "redirect"?
Resolve conflicts between "redirect" and "origin"?
Fix "redirect" by "origin"? fix "origin" by redirect"?
I am all for that. Already have patches to fix "redirect" by "origin" for dirs:
https://github.com/amir73il/linux/commits/ovl-redirect-fix
>>
>> Which reminds me, you did not provide feedback to the patch I posted
>> to detect duplicate redirect dir use case:
>>
>> https://marc.info/?l=linux-unionfs&m=151126880100432&w=2
>>
>> Do you consider this a bug that should be detected by overlayfs
>> as patch proposed or leave it to be detected only when enabling
>> opt-in directory indexing (named verify=on in current WIP patches)?
>>
>> Also waiting for your feedback about merging the duplicate redirect dir
>> test case to xfstests:
>> https://marc.info/?l=fstests&m=151149994629687&w=2
>>
>> Bug or not bug?
>
> Hmm... I'd lean towards non-bug. That "offline modification is
> allowed" rule should point out caveats when messing with overlay
> specific attributes (opaque, whiteout, redirect, etc). Obviously
> having two redirects pointing to the same underlying dir is going to
> result in inconsistencies. We can get away with it without constant
> ino, but I don't think it makes sense to allow that construct.
>
I also think that allowing user to mess with trusted.overlay xattr is
not fair play. The test I posted however, doesn't do that.
The test does cp -a of a redirected upper dir.
Something that perhaps user could get away with before redirect_dir
and something that an innocent user may be doing.
Anyway, directories index lookup takes care of duplicate redirect problem
as a by product of NFS export:
https://github.com/amir73il/linux/commit/b1dd6461aa7c26091aad7c9b65c04cc1071bb9e0
Amir.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-15 14:44 ` Amir Goldstein
@ 2017-12-15 16:06 ` Miklos Szeredi
2017-12-15 16:14 ` Miklos Szeredi
0 siblings, 1 reply; 47+ messages in thread
From: Miklos Szeredi @ 2017-12-15 16:06 UTC (permalink / raw)
To: Amir Goldstein
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Fri, Dec 15, 2017 at 3:44 PM, Amir Goldstein <amir73il@gmail.com> wrote:
> On Fri, Dec 15, 2017 at 4:18 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>> On Thu, Dec 14, 2017 at 5:29 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>>> On Thu, Dec 14, 2017 at 5:48 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> [...]
>>>>
>>>>> Exporting index is a challenge for the same reason and also because tar can
>>>>> break hardlinks on extract. Probably index should be rebuilt from scratch on
>>>>> import, based on "redirect".
>>>>
>>>> Yes, hard links need special handling, so will metacopy. Might be
>>>> worth adding "redirect" to hard links and metacopy to make this issue
>>>> less of a problem.
>>>>
>>>
>>> Do you mean add it now in kernel? hmm, that's just another thing that
>>> can become inconsistent, so I don't see the immediate value.
>>
>> The immediate value is that no need for a special pack/unpack tool for
>> transferring the overlay "image".
>>
>
> OK, but I don't see how we can escape unpack tool for rebuilding the index
> from redirects.
> Do you mean that you want to also follow non-dir "redirect"?
> Resolve conflicts between "redirect" and "origin"?
> Fix "redirect" by "origin"? fix "origin" by redirect"?
> I am all for that. Already have patches to fix "redirect" by "origin" for dirs:
> https://github.com/amir73il/linux/commits/ovl-redirect-fix
>
>>>
>>> Which reminds me, you did not provide feedback to the patch I posted
>>> to detect duplicate redirect dir use case:
>>>
>>> https://marc.info/?l=linux-unionfs&m=151126880100432&w=2
>>>
>>> Do you consider this a bug that should be detected by overlayfs
>>> as patch proposed or leave it to be detected only when enabling
>>> opt-in directory indexing (named verify=on in current WIP patches)?
>>>
>>> Also waiting for your feedback about merging the duplicate redirect dir
>>> test case to xfstests:
>>> https://marc.info/?l=fstests&m=151149994629687&w=2
>>>
>>> Bug or not bug?
>>
>> Hmm... I'd lean towards non-bug. That "offline modification is
>> allowed" rule should point out caveats when messing with overlay
>> specific attributes (opaque, whiteout, redirect, etc). Obviously
>> having two redirects pointing to the same underlying dir is going to
>> result in inconsistencies. We can get away with it without constant
>> ino, but I don't think it makes sense to allow that construct.
>>
>
> I also think that allowing user to mess with trusted.overlay xattr is
> not fair play. The test I posted however, doesn't do that.
> The test does cp -a of a redirected upper dir.
> Something that perhaps user could get away with before redirect_dir
> and something that an innocent user may be doing.
Right. And fsck.overlay will help greatly, since it defines what a
correct image is and what is not. Ovlerlayfs is not expected to
operate correctly on an incorrect image.
In addition we do need to document all this, in order to minimize surprises.
>
> Anyway, directories index lookup takes care of duplicate redirect problem
> as a by product of NFS export:
> https://github.com/amir73il/linux/commit/b1dd6461aa7c26091aad7c9b65c04cc1071bb9e0
Yes, if we detect inconsistencies online, then that will also help.
Thanks,
Miklos
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-15 16:06 ` Miklos Szeredi
@ 2017-12-15 16:14 ` Miklos Szeredi
0 siblings, 0 replies; 47+ messages in thread
From: Miklos Szeredi @ 2017-12-15 16:14 UTC (permalink / raw)
To: Amir Goldstein
Cc: zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On Fri, Dec 15, 2017 at 5:06 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> On Fri, Dec 15, 2017 at 3:44 PM, Amir Goldstein <amir73il@gmail.com> wrote:
>> OK, but I don't see how we can escape unpack tool for rebuilding the index
>> from redirects.
We can't. But we can detect missing or broken index, which can prompt
the rebuilding.
>> Do you mean that you want to also follow non-dir "redirect"?
Only when necessary.
>> Resolve conflicts between "redirect" and "origin"?
>> Fix "redirect" by "origin"? fix "origin" by redirect"?
Interesting questions. I'd guess "redirect" should be the
authoritative one normally, while in the snapshot case it's the other
way around.
Thanks,
Miklos
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-15 14:18 ` Miklos Szeredi
2017-12-15 14:44 ` Amir Goldstein
@ 2017-12-15 15:16 ` Vivek Goyal
2017-12-15 16:17 ` Miklos Szeredi
1 sibling, 1 reply; 47+ messages in thread
From: Vivek Goyal @ 2017-12-15 15:16 UTC (permalink / raw)
To: Miklos Szeredi
Cc: Amir Goldstein, zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie
On Fri, Dec 15, 2017 at 03:18:58PM +0100, Miklos Szeredi wrote:
> On Thu, Dec 14, 2017 at 5:29 PM, Amir Goldstein <amir73il@gmail.com> wrote:
> > On Thu, Dec 14, 2017 at 5:48 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> >> On Thu, Dec 14, 2017 at 4:18 PM, Amir Goldstein <amir73il@gmail.com> wrote:
> >>> On Thu, Dec 14, 2017 at 5:10 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> > [...]
> >>> Yes :) Docker uses tar alright.
> >>> But for example "origin" xattr cannot be exported as is to a portable format.
> >>> Need to decode file handles during export and change them to "redirect"
> >>> for directories and possible to "redirect" for files as well, that
> >>> would be converted
> >>> back to "origin" on import.
> >>
> >> Is it worth preserving origin for non-hardlinks? Same story as "cp
> >> -a", inode numbers will change, so there doesn't appear to be a reason
> >> to preserve the connection between origin and the copied up file.
> >
> > Besides metacopy, no reason.
> >
> >>
> >>> Exporting index is a challenge for the same reason and also because tar can
> >>> break hardlinks on extract. Probably index should be rebuilt from scratch on
> >>> import, based on "redirect".
> >>
> >> Yes, hard links need special handling, so will metacopy. Might be
> >> worth adding "redirect" to hard links and metacopy to make this issue
> >> less of a problem.
> >>
> >
> > Do you mean add it now in kernel? hmm, that's just another thing that
> > can become inconsistent, so I don't see the immediate value.
>
> The immediate value is that no need for a special pack/unpack tool for
> transferring the overlay "image".
Hi Miklos,
So idea is that I should use use REDIRECT xattr instead of ORIGIN for
metacopy. I guess it should work for atleast metacopy feature. Just
that order of lower dirs during mount will not be detected and IIUC,
we might end up doing a copy up of wrong file.
Vivek
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-15 15:16 ` Vivek Goyal
@ 2017-12-15 16:17 ` Miklos Szeredi
0 siblings, 0 replies; 47+ messages in thread
From: Miklos Szeredi @ 2017-12-15 16:17 UTC (permalink / raw)
To: Vivek Goyal
Cc: Amir Goldstein, zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie
On Fri, Dec 15, 2017 at 4:16 PM, Vivek Goyal <vgoyal@redhat.com> wrote:
> So idea is that I should use use REDIRECT xattr instead of ORIGIN for
> metacopy. I guess it should work for atleast metacopy feature. Just
> that order of lower dirs during mount will not be detected and IIUC,
> we might end up doing a copy up of wrong file.
Probably should use both. Need to think about what should happen in
case of an inconsitency.
Thanks,
Miklos
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 14:33 ` Amir Goldstein
2017-12-14 14:47 ` Miklos Szeredi
@ 2017-12-14 15:21 ` Vivek Goyal
2017-12-14 15:43 ` Amir Goldstein
2017-12-15 4:18 ` zhangyi (F)
2 siblings, 1 reply; 47+ messages in thread
From: Vivek Goyal @ 2017-12-14 15:21 UTC (permalink / raw)
To: Amir Goldstein
Cc: Miklos Szeredi, zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie
On Thu, Dec 14, 2017 at 04:33:21PM +0200, Amir Goldstein wrote:
> On Thu, Dec 14, 2017 at 4:13 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
> > On Thu, Dec 14, 2017 at 7:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
> >> fsck.overlay
> >> ============
> >>
> >> fsck.overlay is used to check and optionally repair underlying
> >> directories of overlay-filesystem.
> >
> > Thanks for working on this.
> >
> >
> >>
> >> Check the following points:
> >>
> >> Whiteouts
> >> ---------
> >>
> >> A whiteout is a character device with 0/0 device number. It is used to
> >> record the removed files or directories, When a whiteout is found in a
> >> directory, there should be at least one directory or file with the same
> >> name in any of the corresponding lower layers. If not exist, the whiteout
> >> will be treated as orphan whiteout and remove.
> >
> > Okay.
> >
> >>
> >> Opaque directories
> >> ------------------
> >>
> >> An opaque directory is a directory with "trusted.overlay.opaque" xattr
> >> valued "y". There are two legal situations of making opaque directory: 1)
> >> create directory over whiteout 2) creat directory in merged directory. If an
> >> opaque directory is found, corresponding matching name in lower layers might
> >> exist or parent directory might merged, If not, the opaque xattr will be
> >> treated as invalid and remove.
> >
> > Current version of overlay fs doesn't bother with removing opaque
> > attribute. So not sure fsck.overlay should care. Or at least is
> > should be an optional thing and not worth warning about, since it's
> > perfectly normal.
> >
> >
> >>
> >> Redirect directories
> >> --------------------
> >>
> >> An redirect directory is a directory with "trusted.overlay.redirect"
> >> xattr valued to the path of the original location from the root of the
> >> overlay. It is only used when renaming a directory and "redirect dir"
> >> feature is enabled. If an redirect directory is found, the following
> >> must be met:
> >>
> >> 1) The directory store in redirect xattr should exist in one of lower
> >> layers.
> >
> > Okay.
> >
> >> 2) The origin directory should be redirected only once in one layer,
> >> which mean there is only one redirect xattr point to this origin directory in
> >> the specified layer.
> >> 3) A whiteout or an opaque directory with the same name to origin should
> >> exist in the same directory as the redirect directory.
> >>
> >> If not, 1) The redirect xattr is invalid and need to remove 2) One of
> >> the redirect xattr is redundant but not sure which one is, ask user 3)
> >> Create a whiteout device or set opaque xattr to an existing directory if the
> >> parent directory was meregd or remove xattr if not.
> >
> > Hmm, in this case also should ask the user, as it's not clear that the
> > "new" copy resulting from removal of whiteout on upper is the wanted
> > one or the "old" renamed copy.
> >
> >
> >>
> >> Usage
> >> =====
> >>
> >> 1. Ensure overlay filesystem is not mounted based on directories which
> >> need to check.
> >>
> >> 2. Run fsck.overlay program:
> >> Usage:
> >> fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
> >>
> >> Options:
> >> -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
> >> multiple lower use ':' as separator.
> >> -u, --upperdir=UPPERDIR specify upper directory of overlayfs
> >> -w, --workdir=WORKDIR specify work directory of overlayfs
> >
> > Not sure what other fsck do, but I'd feel more logical to have the
> > same -olowerdir=..., etc. notation as for mount.
> >
>
> Other fsck do not have this problem.
> They only need blockdev as input.
> Which leads me to an idea I have been wondering about for the overlayfs
> utilities - a specification file, e.g.:
>
> # create dirs and write their path to a spec file:
> mkfs.overlay -ometacopy=on,lowerdir=... myovl.spec
> # mount overlay using mount.overlay helper:
> mount -t overlay myovl.spec /ovl
> # fsck with just one configuration that is consistent with mkfs and mount:
> fsck.overlay -n myovl.spec
>
> The specification file can also determine the backward incompatible
> features of the overlay, for example, if user sets -metacopy=on during mkfs
> mount.overlay helper will refuse to mount with kernel that does not
> support metacopy. The reason we CAN do that with spec file is because spec
> file determines that overlay was born with metacopy feature enabled.
> It is not the same an overlay that was once mounted with metacopy=on and
> then we don't allow it to mount with an old kernel.
So why not store this information in an xattr on upper/ (instead of spec
file) and then overlay specific helpers could parse it do same thing. I
mean otherwise user space has to worry about storing and finding out
right foo.ovl.spec file for any mount/unmount or other operations. From
a user's perspective, I would be glad if I don't have to worry about
managing another spec file per overlay mount.
This will only work if kernel is old but tools are still new. Not sure
how many a times people run with this configuraiotion.
Thanks
Vivek
>
> This method could delegate the entire feature compatibility to userspace
> mount helper.
>
> Another nice thing about mount.overlay helper is that it could abstarct
> away the move from mount() to mount2() when the time comes and then
> users can keep using existing tools but won't have the existing limit on
> number of lowerdirs.
>
> Thoughts?
>
> Amir.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 15:21 ` Vivek Goyal
@ 2017-12-14 15:43 ` Amir Goldstein
2017-12-14 16:12 ` Vivek Goyal
0 siblings, 1 reply; 47+ messages in thread
From: Amir Goldstein @ 2017-12-14 15:43 UTC (permalink / raw)
To: Vivek Goyal
Cc: Miklos Szeredi, zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie
On Thu, Dec 14, 2017 at 5:21 PM, Vivek Goyal <vgoyal@redhat.com> wrote:
> On Thu, Dec 14, 2017 at 04:33:21PM +0200, Amir Goldstein wrote:
...
>> Other fsck do not have this problem.
>> They only need blockdev as input.
>> Which leads me to an idea I have been wondering about for the overlayfs
>> utilities - a specification file, e.g.:
>>
>> # create dirs and write their path to a spec file:
>> mkfs.overlay -ometacopy=on,lowerdir=... myovl.spec
>> # mount overlay using mount.overlay helper:
>> mount -t overlay myovl.spec /ovl
>> # fsck with just one configuration that is consistent with mkfs and mount:
>> fsck.overlay -n myovl.spec
>>
>> The specification file can also determine the backward incompatible
>> features of the overlay, for example, if user sets -metacopy=on during mkfs
>> mount.overlay helper will refuse to mount with kernel that does not
>> support metacopy. The reason we CAN do that with spec file is because spec
>> file determines that overlay was born with metacopy feature enabled.
>> It is not the same an overlay that was once mounted with metacopy=on and
>> then we don't allow it to mount with an old kernel.
>
> So why not store this information in an xattr on upper/ (instead of spec
> file) and then overlay specific helpers could parse it do same thing. I
Maybe.
> mean otherwise user space has to worry about storing and finding out
> right foo.ovl.spec file for any mount/unmount or other operations. From
> a user's perspective, I would be glad if I don't have to worry about
> managing another spec file per overlay mount.
>
That's one way of looking at it, another way to look at it would be now
user doesn't need to worry 3 directories but just one file. Anyway the
spec file is meant to be an abstraction layer, not a replacement for
using existing mount options.
> This will only work if kernel is old but tools are still new. Not sure
> how many a times people run with this configuraiotion.
>
The major benefit of starting fresh with user tools and spec file is that we
can start by checking features compatibility from day 1.
You can think of a spec file as a declaration from admin that this overlay
is never going to be mounted on a kernel that doesn't support the spec
file required features.
It's fine if the "file" end up being stored in "features" or "spec" xattr on
upper dir. That is an implementation detail and we can actually make
this a user choice and user tools can both accept a spec file as input
or look for the xattr in upper dir.
Amir.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 15:43 ` Amir Goldstein
@ 2017-12-14 16:12 ` Vivek Goyal
0 siblings, 0 replies; 47+ messages in thread
From: Vivek Goyal @ 2017-12-14 16:12 UTC (permalink / raw)
To: Amir Goldstein
Cc: Miklos Szeredi, zhangyi (F),
linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie
On Thu, Dec 14, 2017 at 05:43:00PM +0200, Amir Goldstein wrote:
> On Thu, Dec 14, 2017 at 5:21 PM, Vivek Goyal <vgoyal@redhat.com> wrote:
> > On Thu, Dec 14, 2017 at 04:33:21PM +0200, Amir Goldstein wrote:
> ...
> >> Other fsck do not have this problem.
> >> They only need blockdev as input.
> >> Which leads me to an idea I have been wondering about for the overlayfs
> >> utilities - a specification file, e.g.:
> >>
> >> # create dirs and write their path to a spec file:
> >> mkfs.overlay -ometacopy=on,lowerdir=... myovl.spec
> >> # mount overlay using mount.overlay helper:
> >> mount -t overlay myovl.spec /ovl
> >> # fsck with just one configuration that is consistent with mkfs and mount:
> >> fsck.overlay -n myovl.spec
> >>
> >> The specification file can also determine the backward incompatible
> >> features of the overlay, for example, if user sets -metacopy=on during mkfs
> >> mount.overlay helper will refuse to mount with kernel that does not
> >> support metacopy. The reason we CAN do that with spec file is because spec
> >> file determines that overlay was born with metacopy feature enabled.
> >> It is not the same an overlay that was once mounted with metacopy=on and
> >> then we don't allow it to mount with an old kernel.
> >
> > So why not store this information in an xattr on upper/ (instead of spec
> > file) and then overlay specific helpers could parse it do same thing. I
>
> Maybe.
>
> > mean otherwise user space has to worry about storing and finding out
> > right foo.ovl.spec file for any mount/unmount or other operations. From
> > a user's perspective, I would be glad if I don't have to worry about
> > managing another spec file per overlay mount.
> >
>
> That's one way of looking at it, another way to look at it would be now
> user doesn't need to worry 3 directories but just one file. Anyway the
> spec file is meant to be an abstraction layer, not a replacement for
> using existing mount options.
User still need to worry about 3 (or more) directories for spec file
creation. And for furture mounts/remount spec file can be used. Not
sure how it will work with changing spec file etc.
>
> > This will only work if kernel is old but tools are still new. Not sure
> > how many a times people run with this configuraiotion.
> >
>
> The major benefit of starting fresh with user tools and spec file is that we
> can start by checking features compatibility from day 1.
> You can think of a spec file as a declaration from admin that this overlay
> is never going to be mounted on a kernel that doesn't support the spec
> file required features.
> It's fine if the "file" end up being stored in "features" or "spec" xattr on
> upper dir. That is an implementation detail and we can actually make
> this a user choice and user tools can both accept a spec file as input
> or look for the xattr in upper dir.
Ok. I personally like the idea of storing required info in an xattr in upper
and not having to worry about managing spec file for overlay mount. But that's
just me. :-)
Vivek
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 14:33 ` Amir Goldstein
2017-12-14 14:47 ` Miklos Szeredi
2017-12-14 15:21 ` Vivek Goyal
@ 2017-12-15 4:18 ` zhangyi (F)
2 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-15 4:18 UTC (permalink / raw)
To: Amir Goldstein, Miklos Szeredi
Cc: linux-unionfs, fstests, Eryu Guan, Darrick J. Wong, Miao Xie,
Vivek Goyal
On 2017/12/14 22:33, Amir Goldstein Wrote:
> On Thu, Dec 14, 2017 at 4:13 PM, Miklos Szeredi <miklos@szeredi.hu> wrote:
>> On Thu, Dec 14, 2017 at 7:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
>>> fsck.overlay
>>> ============
>>>
>>> fsck.overlay is used to check and optionally repair underlying
>>> directories of overlay-filesystem.
>>
>> Thanks for working on this.
>>
>>
>>>
>>> Check the following points:
>>>
>>> Whiteouts
>>> ---------
>>>
>>> A whiteout is a character device with 0/0 device number. It is used to
>>> record the removed files or directories, When a whiteout is found in a
>>> directory, there should be at least one directory or file with the same
>>> name in any of the corresponding lower layers. If not exist, the whiteout
>>> will be treated as orphan whiteout and remove.
>>
>> Okay.
>>
>>>
>>> Opaque directories
>>> ------------------
>>>
>>> An opaque directory is a directory with "trusted.overlay.opaque" xattr
>>> valued "y". There are two legal situations of making opaque directory: 1)
>>> create directory over whiteout 2) creat directory in merged directory. If an
>>> opaque directory is found, corresponding matching name in lower layers might
>>> exist or parent directory might merged, If not, the opaque xattr will be
>>> treated as invalid and remove.
>>
>> Current version of overlay fs doesn't bother with removing opaque
>> attribute. So not sure fsck.overlay should care. Or at least is
>> should be an optional thing and not worth warning about, since it's
>> perfectly normal.
>>
>>
>>>
>>> Redirect directories
>>> --------------------
>>>
>>> An redirect directory is a directory with "trusted.overlay.redirect"
>>> xattr valued to the path of the original location from the root of the
>>> overlay. It is only used when renaming a directory and "redirect dir"
>>> feature is enabled. If an redirect directory is found, the following
>>> must be met:
>>>
>>> 1) The directory store in redirect xattr should exist in one of lower
>>> layers.
>>
>> Okay.
>>
>>> 2) The origin directory should be redirected only once in one layer,
>>> which mean there is only one redirect xattr point to this origin directory in
>>> the specified layer.
>>> 3) A whiteout or an opaque directory with the same name to origin should
>>> exist in the same directory as the redirect directory.
>>>
>>> If not, 1) The redirect xattr is invalid and need to remove 2) One of
>>> the redirect xattr is redundant but not sure which one is, ask user 3)
>>> Create a whiteout device or set opaque xattr to an existing directory if the
>>> parent directory was meregd or remove xattr if not.
>>
>> Hmm, in this case also should ask the user, as it's not clear that the
>> "new" copy resulting from removal of whiteout on upper is the wanted
>> one or the "old" renamed copy.
>>
>>
>>>
>>> Usage
>>> =====
>>>
>>> 1. Ensure overlay filesystem is not mounted based on directories which
>>> need to check.
>>>
>>> 2. Run fsck.overlay program:
>>> Usage:
>>> fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
>>>
>>> Options:
>>> -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
>>> multiple lower use ':' as separator.
>>> -u, --upperdir=UPPERDIR specify upper directory of overlayfs
>>> -w, --workdir=WORKDIR specify work directory of overlayfs
>>
>> Not sure what other fsck do, but I'd feel more logical to have the
>> same -olowerdir=..., etc. notation as for mount.
>>
>
> Other fsck do not have this problem.
> They only need blockdev as input.
> Which leads me to an idea I have been wondering about for the overlayfs
> utilities - a specification file, e.g.:
>
> # create dirs and write their path to a spec file:
> mkfs.overlay -ometacopy=on,lowerdir=... myovl.spec
> # mount overlay using mount.overlay helper:
> mount -t overlay myovl.spec /ovl
> # fsck with just one configuration that is consistent with mkfs and mount:
> fsck.overlay -n myovl.spec
>
> The specification file can also determine the backward incompatible
> features of the overlay, for example, if user sets -metacopy=on during mkfs
> mount.overlay helper will refuse to mount with kernel that does not
> support metacopy. The reason we CAN do that with spec file is because spec
> file determines that overlay was born with metacopy feature enabled.
> It is not the same an overlay that was once mounted with metacopy=on and
> then we don't allow it to mount with an old kernel.
>
Maybe we also need another tool like "tune2fs.overlay" to let users to add or
remove features when they update kernel. :)
Thanks,
Yi.
> This method could delegate the entire feature compatibility to userspace
> mount helper.
>
> Another nice thing about mount.overlay helper is that it could abstarct
> away the move from mount() to mount2() when the time comes and then
> users can keep using existing tools but won't have the existing limit on
> number of lowerdirs.
>
> Thoughts?
>
> Amir.
>
> .
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-14 14:13 ` Miklos Szeredi
2017-12-14 14:33 ` Amir Goldstein
@ 2017-12-15 3:35 ` zhangyi (F)
2017-12-15 7:45 ` Amir Goldstein
1 sibling, 1 reply; 47+ messages in thread
From: zhangyi (F) @ 2017-12-15 3:35 UTC (permalink / raw)
To: Miklos Szeredi
Cc: linux-unionfs, fstests, Amir Goldstein, Eryu Guan,
Darrick J. Wong, miaoxie
On 2017/12/14 22:13, Miklos Szeredi Wrote:
> On Thu, Dec 14, 2017 at 7:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
>> fsck.overlay
>> ============
>>
>> fsck.overlay is used to check and optionally repair underlying
>> directories of overlay-filesystem.
>
> Thanks for working on this.
>
>
>>
>> Check the following points:
>>
>> Whiteouts
>> ---------
>>
>> A whiteout is a character device with 0/0 device number. It is used to
>> record the removed files or directories, When a whiteout is found in a
>> directory, there should be at least one directory or file with the same
>> name in any of the corresponding lower layers. If not exist, the whiteout
>> will be treated as orphan whiteout and remove.
>
> Okay.
>
>>
>> Opaque directories
>> ------------------
>>
>> An opaque directory is a directory with "trusted.overlay.opaque" xattr
>> valued "y". There are two legal situations of making opaque directory: 1)
>> create directory over whiteout 2) creat directory in merged directory. If an
>> opaque directory is found, corresponding matching name in lower layers might
>> exist or parent directory might merged, If not, the opaque xattr will be
>> treated as invalid and remove.
>
> Current version of overlay fs doesn't bother with removing opaque
> attribute. So not sure fsck.overlay should care. Or at least is
> should be an optional thing and not worth warning about, since it's
> perfectly normal.
>
Indeed, we can introduce '-f' option to handle this (e2fsck(8)):
-f Force checking even if the file system seems clean.
>>
>> Redirect directories
>> --------------------
>>
>> An redirect directory is a directory with "trusted.overlay.redirect"
>> xattr valued to the path of the original location from the root of the
>> overlay. It is only used when renaming a directory and "redirect dir"
>> feature is enabled. If an redirect directory is found, the following
>> must be met:
>>
>> 1) The directory store in redirect xattr should exist in one of lower
>> layers.
>
> Okay.
>
>> 2) The origin directory should be redirected only once in one layer,
>> which mean there is only one redirect xattr point to this origin directory in
>> the specified layer.
>> 3) A whiteout or an opaque directory with the same name to origin should
>> exist in the same directory as the redirect directory.
>>
>> If not, 1) The redirect xattr is invalid and need to remove 2) One of
>> the redirect xattr is redundant but not sure which one is, ask user 3)
>> Create a whiteout device or set opaque xattr to an existing directory if the
>> parent directory was meregd or remove xattr if not.
>
> Hmm, in this case also should ask the user, as it's not clear that the
> "new" copy resulting from removal of whiteout on upper is the wanted
> one or the "old" renamed copy.
>
Thanks for point this out, do you mean the newly created directory over whiteout
between old renamed directory? If so, Amir have already pointed out in the first
iteration and I handled it in current version. Please see:
https://www.spinics.net/lists/linux-unionfs/msg03268.html
Now, fsck will also check dir's redirect xattr for this case, it will add opaque
xattr only when parent is merged and not redirected.
>>
>> Usage
>> =====
>>
>> 1. Ensure overlay filesystem is not mounted based on directories which
>> need to check.
>>
>> 2. Run fsck.overlay program:
>> Usage:
>> fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
>>
>> Options:
>> -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
>> multiple lower use ':' as separator.
>> -u, --upperdir=UPPERDIR specify upper directory of overlayfs
>> -w, --workdir=WORKDIR specify work directory of overlayfs
>
> Not sure what other fsck do, but I'd feel more logical to have the
> same -olowerdir=..., etc. notation as for mount.
>
It's fine by me, I will change it for current version.
Thanks,
Yi.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-15 3:35 ` zhangyi (F)
@ 2017-12-15 7:45 ` Amir Goldstein
2017-12-15 9:13 ` zhangyi (F)
0 siblings, 1 reply; 47+ messages in thread
From: Amir Goldstein @ 2017-12-15 7:45 UTC (permalink / raw)
To: zhangyi (F)
Cc: Miklos Szeredi, linux-unionfs, fstests, Eryu Guan,
Darrick J. Wong, Miao Xie
On Fri, Dec 15, 2017 at 5:35 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
> On 2017/12/14 22:13, Miklos Szeredi Wrote:
[...]
>>
>>>
>>> Opaque directories
>>> ------------------
>>>
>>> An opaque directory is a directory with "trusted.overlay.opaque" xattr
>>> valued "y". There are two legal situations of making opaque directory: 1)
>>> create directory over whiteout 2) creat directory in merged directory. If an
>>> opaque directory is found, corresponding matching name in lower layers might
>>> exist or parent directory might merged, If not, the opaque xattr will be
>>> treated as invalid and remove.
>>
>> Current version of overlay fs doesn't bother with removing opaque
>> attribute. So not sure fsck.overlay should care. Or at least is
>> should be an optional thing and not worth warning about, since it's
>> perfectly normal.
>>
> Indeed, we can introduce '-f' option to handle this (e2fsck(8)):
>
> -f Force checking even if the file system seems clean.
>
Hmm, I would not use -f for that, because it means something completely
different in e2fsck.
ext4 has a "clean" super block flag, which is set on clean unmount.
-f means to run even if "clean" flag is set.
Please reserve -f for that future use case.
What Miklos is saying, and I agree with him, is that fsck.overlay should be
resolve inconsistencies rather then cleanup leftovers that don't bother anyone.
BTW, you should also add a check for "impure" xattr.
There are clear rules about when "impure" should be set - when a pure dir has
entries with "origin" or "redirect" entries inside it - those rule
were NOT honored
since introduction of "redirect" and they were even not fully honored sine
introduction of "origin" ("ovl: mark parent impure on ovl_link()" was
added later)
Missing "impure" will cause wrong d_ino in readdir of impure dir.
[...]
>>
>>> 2) The origin directory should be redirected only once in one layer,
>>> which mean there is only one redirect xattr point to this origin directory in
>>> the specified layer.
>>> 3) A whiteout or an opaque directory with the same name to origin should
>>> exist in the same directory as the redirect directory.
>>>
>>> If not, 1) The redirect xattr is invalid and need to remove 2) One of
>>> the redirect xattr is redundant but not sure which one is, ask user 3)
>>> Create a whiteout device or set opaque xattr to an existing directory if the
>>> parent directory was meregd or remove xattr if not.
>>
>> Hmm, in this case also should ask the user, as it's not clear that the
>> "new" copy resulting from removal of whiteout on upper is the wanted
>> one or the "old" renamed copy.
>>
> Thanks for point this out, do you mean the newly created directory over whiteout
> between old renamed directory? If so, Amir have already pointed out in the first
> iteration and I handled it in current version. Please see:
>
> https://www.spinics.net/lists/linux-unionfs/msg03268.html
>
> Now, fsck will also check dir's redirect xattr for this case, it will add opaque
> xattr only when parent is merged and not redirected.
>
I think what Miklos meant is what I wrote in comment to test 203.
User needs to be asked which dir should be the merge dir and not
assume that the redirected dir is the correct answer.
Amir.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 01/18] overlay: implement fsck utility
2017-12-15 7:45 ` Amir Goldstein
@ 2017-12-15 9:13 ` zhangyi (F)
0 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-15 9:13 UTC (permalink / raw)
To: Amir Goldstein
Cc: Miklos Szeredi, linux-unionfs, fstests, Eryu Guan,
Darrick J. Wong, Miao Xie
On 2017/12/15 15:45, Amir Goldstein Wrote:
> On Fri, Dec 15, 2017 at 5:35 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
>> On 2017/12/14 22:13, Miklos Szeredi Wrote:
> [...]
>
>>>
>>>>
>>>> Opaque directories
>>>> ------------------
>>>>
>>>> An opaque directory is a directory with "trusted.overlay.opaque" xattr
>>>> valued "y". There are two legal situations of making opaque directory: 1)
>>>> create directory over whiteout 2) creat directory in merged directory. If an
>>>> opaque directory is found, corresponding matching name in lower layers might
>>>> exist or parent directory might merged, If not, the opaque xattr will be
>>>> treated as invalid and remove.
>>>
>>> Current version of overlay fs doesn't bother with removing opaque
>>> attribute. So not sure fsck.overlay should care. Or at least is
>>> should be an optional thing and not worth warning about, since it's
>>> perfectly normal.
>>>
>> Indeed, we can introduce '-f' option to handle this (e2fsck(8)):
>>
>> -f Force checking even if the file system seems clean.
>>
>
> Hmm, I would not use -f for that, because it means something completely
> different in e2fsck.
> ext4 has a "clean" super block flag, which is set on clean unmount.
> -f means to run even if "clean" flag is set.
> Please reserve -f for that future use case.
> What Miklos is saying, and I agree with him, is that fsck.overlay should be
> resolve inconsistencies rather then cleanup leftovers that don't bother anyone.
>
Yes, it seems that check opaque is useless, we should more take care of what will
lead to inconsistencies, will remove this check.
> BTW, you should also add a check for "impure" xattr.
> There are clear rules about when "impure" should be set - when a pure dir has
> entries with "origin" or "redirect" entries inside it - those rule
> were NOT honored
> since introduction of "redirect" and they were even not fully honored sine
> introduction of "origin" ("ovl: mark parent impure on ovl_link()" was
> added later)
>
> Missing "impure" will cause wrong d_ino in readdir of impure dir.
>
This is listed in my todo list, will realize this check soon.
> [...]
>
>>>
>>>> 2) The origin directory should be redirected only once in one layer,
>>>> which mean there is only one redirect xattr point to this origin directory in
>>>> the specified layer.
>>>> 3) A whiteout or an opaque directory with the same name to origin should
>>>> exist in the same directory as the redirect directory.
>>>>
>>>> If not, 1) The redirect xattr is invalid and need to remove 2) One of
>>>> the redirect xattr is redundant but not sure which one is, ask user 3)
>>>> Create a whiteout device or set opaque xattr to an existing directory if the
>>>> parent directory was meregd or remove xattr if not.
>>>
>>> Hmm, in this case also should ask the user, as it's not clear that the
>>> "new" copy resulting from removal of whiteout on upper is the wanted
>>> one or the "old" renamed copy.
>>>
>> Thanks for point this out, do you mean the newly created directory over whiteout
>> between old renamed directory? If so, Amir have already pointed out in the first
>> iteration and I handled it in current version. Please see:
>>
>> https://www.spinics.net/lists/linux-unionfs/msg03268.html
>>
>> Now, fsck will also check dir's redirect xattr for this case, it will add opaque
>> xattr only when parent is merged and not redirected.
>>
>
> I think what Miklos meant is what I wrote in comment to test 203.
> User needs to be asked which dir should be the merge dir and not
> assume that the redirected dir is the correct answer.
>
Understand, will fix it.
Thanks,
Yi.
^ permalink raw reply [flat|nested] 47+ messages in thread
* [PATCH v2 02/18] fsck.overlay: fix uninitialized variable
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 01/18] overlay: implement fsck utility zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 9:15 ` Amir Goldstein
2017-12-14 6:47 ` [PATCH v2 03/18] fsck.overlay: add -n -p and -y options zhangyi (F)
` (16 subsequent siblings)
18 siblings, 1 reply; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
fsck.c | 8 ++++----
mount.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fsck.c b/fsck.c
index cbcb8e9..7f704c8 100644
--- a/fsck.c
+++ b/fsck.c
@@ -25,12 +25,12 @@
char *program_name;
-char **lowerdir;
+char **lowerdir = NULL;
char upperdir[PATH_MAX] = {0};
char workdir[PATH_MAX] = {0};
-unsigned int lower_num;
-int flags; /* user input option flags */
-int status; /* fsck scan status */
+unsigned int lower_num = 0;
+int flags = 0; /* user input option flags */
+int status = 0; /* fsck scan status */
/* Cleanup lower directories buf */
static void ovl_clean_lowerdirs(void)
diff --git a/mount.c b/mount.c
index 28ce8e5..768c7aa 100644
--- a/mount.c
+++ b/mount.c
@@ -269,10 +269,10 @@ static void ovl_scan_mount_exit(struct ovl_mnt_entry *ovl_mnt_entries,
*/
int ovl_check_mount(bool *pass)
{
- struct ovl_mnt_entry *ovl_mnt_entries;
- int ovl_mnt_entry_count;
- char *mounted_path;
- bool mounted;
+ struct ovl_mnt_entry *ovl_mnt_entries = NULL;
+ int ovl_mnt_entry_count = 0;
+ char *mounted_path = NULL;
+ bool mounted = false;
int i,j,k;
int ret;
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* Re: [PATCH v2 02/18] fsck.overlay: fix uninitialized variable
2017-12-14 6:47 ` [PATCH v2 02/18] fsck.overlay: fix uninitialized variable zhangyi (F)
@ 2017-12-14 9:15 ` Amir Goldstein
0 siblings, 0 replies; 47+ messages in thread
From: Amir Goldstein @ 2017-12-14 9:15 UTC (permalink / raw)
To: zhangyi (F)
Cc: overlayfs, fstests, Miklos Szeredi, Eryu Guan, Darrick J. Wong, Miao Xie
On Thu, Dec 14, 2017 at 8:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
Same here, no place for this patch in review.
Please re-post a clean series of patch.
Each of the patches posted should be bisectable, meaning that
after applying each patch, your code should at least build and
best to not introduce functional regressions along the series.
> ---
> fsck.c | 8 ++++----
> mount.c | 8 ++++----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/fsck.c b/fsck.c
> index cbcb8e9..7f704c8 100644
> --- a/fsck.c
> +++ b/fsck.c
> @@ -25,12 +25,12 @@
>
> char *program_name;
>
> -char **lowerdir;
> +char **lowerdir = NULL;
> char upperdir[PATH_MAX] = {0};
> char workdir[PATH_MAX] = {0};
> -unsigned int lower_num;
> -int flags; /* user input option flags */
> -int status; /* fsck scan status */
> +unsigned int lower_num = 0;
> +int flags = 0; /* user input option flags */
> +int status = 0; /* fsck scan status */
>
> /* Cleanup lower directories buf */
> static void ovl_clean_lowerdirs(void)
> diff --git a/mount.c b/mount.c
> index 28ce8e5..768c7aa 100644
> --- a/mount.c
> +++ b/mount.c
> @@ -269,10 +269,10 @@ static void ovl_scan_mount_exit(struct ovl_mnt_entry *ovl_mnt_entries,
> */
> int ovl_check_mount(bool *pass)
> {
> - struct ovl_mnt_entry *ovl_mnt_entries;
> - int ovl_mnt_entry_count;
> - char *mounted_path;
> - bool mounted;
> + struct ovl_mnt_entry *ovl_mnt_entries = NULL;
> + int ovl_mnt_entry_count = 0;
> + char *mounted_path = NULL;
> + bool mounted = false;
> int i,j,k;
> int ret;
>
> --
> 2.9.5
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* [PATCH v2 03/18] fsck.overlay: add -n -p and -y options
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 01/18] overlay: implement fsck utility zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 02/18] fsck.overlay: fix uninitialized variable zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 04/18] fsck.overlay: add path package and split helper zhangyi (F)
` (15 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Add -n -p and -y options to make it official as fsck utilities.
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
fsck.c | 36 ++++++++++++++++++++++++++++++------
lib.c | 3 ++-
lib.h | 6 +++++-
3 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/fsck.c b/fsck.c
index 7f704c8..f4c806b 100644
--- a/fsck.c
+++ b/fsck.c
@@ -49,13 +49,16 @@ static void ovl_clean_lowerdirs(void)
static void usage(void)
{
print_info(_("Usage:\n\t%s [-l lowerdir] [-u upperdir] [-w workdir] "
- "[-avhV]\n\n"), program_name);
+ "[-pnyvhV]\n\n"), program_name);
print_info(_("Options:\n"
"-l, --lowerdir=LOWERDIR specify lower directories of overlayfs,\n"
- " multiple lower use ':' as separator\n"
+ " multiple lower use ':' as separator,\n"
+ " the leftmost one is the toppest\n"
"-u, --upperdir=UPPERDIR specify upper directory of overlayfs\n"
"-w, --workdir=WORKDIR specify work directory of overlayfs\n"
- "-a, --auto repair automatically (no questions)\n"
+ "-p, automatic repair (no questions)\n"
+ "-n, make no changes to the filesystem\n"
+ "-y, assume \"yes\" to all questions\n"
"-v, --verbose print more messages of overlayfs\n"
"-h, --help display this usage of overlayfs\n"
"-V, --version display version information\n"));
@@ -67,19 +70,19 @@ static void parse_options(int argc, char *argv[])
char *lowertemp;
int c;
int ret = 0;
+ bool opt_conflict = false;
struct option long_options[] = {
{"lowerdir", required_argument, NULL, 'l'},
{"upperdir", required_argument, NULL, 'u'},
{"workdir", required_argument, NULL, 'w'},
- {"auto", no_argument, NULL, 'a'},
{"verbose", no_argument, NULL, 'v'},
{"version", no_argument, NULL, 'V'},
{"help", no_argument, NULL, 'h'},
{NULL, 0, NULL, 0}
};
- while ((c = getopt_long(argc, argv, "l:u:w:avVh", long_options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "l:u:w:apnyvVh", long_options, NULL)) != -1) {
switch (c) {
case 'l':
lowertemp = strdup(optarg);
@@ -105,7 +108,23 @@ static void parse_options(int argc, char *argv[])
}
break;
case 'a':
- flags |= FL_AUTO;
+ case 'p':
+ if (flags & (FL_OPT_YES | FL_OPT_NO))
+ opt_conflict = true;
+ else
+ flags |= FL_OPT_AUTO;
+ break;
+ case 'n':
+ if (flags & (FL_OPT_YES | FL_OPT_AUTO))
+ opt_conflict = true;
+ else
+ flags |= FL_OPT_NO;
+ break;
+ case 'y':
+ if (flags & (FL_OPT_NO | FL_OPT_AUTO))
+ opt_conflict = true;
+ else
+ flags |= FL_OPT_YES;
break;
case 'v':
flags |= FL_VERBOSE;
@@ -127,6 +146,11 @@ static void parse_options(int argc, char *argv[])
print_info(_("Please specify correct lowerdirs and upperdir\n"));
usage();
}
+
+ if (opt_conflict) {
+ print_info(_("Only one of the options -p/-a, -n or -y can be specified.\n"));
+ usage();
+ }
}
void fsck_status_check(int *val)
diff --git a/lib.c b/lib.c
index a6832fe..7607517 100644
--- a/lib.c
+++ b/lib.c
@@ -46,7 +46,8 @@ static int ask_yn(const char *question, int def)
/* Ask user */
int ask_question(const char *question, int def)
{
- if (flags & FL_AUTO) {
+ if (flags & FL_OPT_MASK) {
+ def = (flags & FL_OPT_YES) ? 1 : (flags & FL_OPT_NO) ? 0 : def;
print_info(_("%s? %s\n"), question, def ? _("y") : _("n"));
return def;
}
diff --git a/lib.h b/lib.h
index 463b263..2956235 100644
--- a/lib.h
+++ b/lib.h
@@ -19,7 +19,11 @@
#define FL_VERBOSE (1 << 0) /* verbose */
#define FL_UPPER (1 << 1) /* specify upper directory */
#define FL_WORK (1 << 2) /* specify work directory */
-#define FL_AUTO (1 << 3) /* automactically scan dirs and repair */
+#define FL_OPT_AUTO (1 << 3) /* automactically scan dirs and repair */
+#define FL_OPT_NO (1 << 4) /* no changes to the filesystem */
+#define FL_OPT_YES (1 << 5) /* yes to all questions */
+#define FL_OPT_MASK (FL_OPT_AUTO|FL_OPT_NO|FL_OPT_YES)
+
/* Scan path type */
#define OVL_UPPER 0
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 04/18] fsck.overlay: add path package and split helper
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (2 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 03/18] fsck.overlay: add -n -p and -y options zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 05/18] fsck.overlay: convert path parse to use helper function zhangyi (F)
` (14 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Add path helpers to handle redundant or missing '/' when package and
split path.
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
lib.c | 36 ++++++++++++++++++++++++++++++++++++
lib.h | 3 +++
2 files changed, 39 insertions(+)
diff --git a/lib.c b/lib.c
index 7607517..ecc5d27 100644
--- a/lib.c
+++ b/lib.c
@@ -126,6 +126,42 @@ int remove_xattr(const char *pathname, const char *xattrname)
return ret;
}
+char *path_pack(char *out, int len, const char *base, const char *append)
+{
+ int baselen = strlen(base);
+
+ if (base[baselen-1] == '/' && append[0] == '/')
+ snprintf(out, len, "%s%s", base, append+1);
+ else if (base[baselen-1] != '/' && append[0] != '/')
+ snprintf(out, len, "%s/%s", base, append);
+ else
+ snprintf(out, len, "%s%s", base, append);
+
+ return out;
+}
+
+char *path_truncate(char *out, int len, const char *path, const char *filename)
+{
+ int filelen = strlen(filename);
+ int pathlen = strlen(path);
+ int cplen;
+
+ cplen = (filename[0] == '/') ? pathlen-filelen : pathlen-filelen-1;
+ cplen = cplen < len ? cplen : len-1;
+
+ memcpy(out, path, cplen);
+ out[cplen] = '\0';
+
+ return out;
+}
+
+const char *path_pick(const char *path, int baselen)
+{
+ const char *p = path + baselen;
+
+ return (*p == '/') ? p+1 : p;
+}
+
static inline int __check_entry(struct scan_ctx *sctx,
int (*do_check)(struct scan_ctx *))
{
diff --git a/lib.h b/lib.h
index 2956235..618791c 100644
--- a/lib.h
+++ b/lib.h
@@ -73,5 +73,8 @@ ssize_t get_xattr(const char *pathname, const char *xattrname,
int set_xattr(const char *pathname, const char *xattrname,
void *value, size_t size);
int remove_xattr(const char *pathname, const char *xattrname);
+char *path_pack(char *out, int len, const char *base, const char *append);
+char *path_truncate(char *out, int len, const char *path, const char *filename);
+const char *path_pick(const char *path, int baselen);
#endif /* OVL_LIB_H */
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 05/18] fsck.overlay: convert path parse to use helper function
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (3 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 04/18] fsck.overlay: add path package and split helper zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 06/18] fsck.overlay: open lowerdirs in advance zhangyi (F)
` (13 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
check.c | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/check.c b/check.c
index 1794501..add7e11 100644
--- a/check.c
+++ b/check.c
@@ -113,9 +113,13 @@ static int ovl_get_redirect(const char *pathname, size_t dirlen,
buf = srealloc(buf, ret + baselen + 1);
memmove(buf + baselen, buf, ret);
memcpy(buf, pathname+dirlen, baselen);
- buf[ret + baselen] = '\0';
+ ret += baselen;
}
+ ret -= 1;
+ memmove(buf, buf+1, ret);
+ buf[ret] = '\0';
+
*redirect = buf;
return 0;
}
@@ -143,7 +147,7 @@ static inline int ovl_create_whiteout(const char *pathname)
* skip: skip whiteout.
*
*/
-static int ovl_check_lower(const char *path, unsigned int start,
+static int ovl_check_lower(const char *pathname, unsigned int start,
struct ovl_lower_check *chk, bool skip)
{
char lower_path[PATH_MAX];
@@ -151,7 +155,7 @@ static int ovl_check_lower(const char *path, unsigned int start,
unsigned int i;
for (i = start; i < lower_num; i++) {
- snprintf(lower_path, sizeof(lower_path), "%s%s", lowerdir[i], path);
+ path_pack(lower_path, sizeof(lower_path), lowerdir[i], pathname);
if (lstat(lower_path, &st) != 0) {
if (errno != ENOENT && errno != ENOTDIR) {
@@ -165,9 +169,10 @@ static int ovl_check_lower(const char *path, unsigned int start,
if (skip && is_whiteout(&st))
continue;
+ strncpy(chk->path, lower_path, sizeof(chk->path));
chk->exist = true;
chk->st = st;
- strncpy(chk->path, lower_path, sizeof(chk->path));
+
break;
}
@@ -200,7 +205,8 @@ static int ovl_check_whiteout(struct scan_ctx *sctx)
* check is there a file or dir with the same name.
*/
start = (sctx->dirtype == OVL_LOWER) ? sctx->num + 1 : 0;
- ret = ovl_check_lower(pathname + sctx->dirlen, start, &chk, true);
+ ret = ovl_check_lower(path_pick(pathname, sctx->dirlen),
+ start, &chk, true);
if (ret)
return ret;
if (chk.exist && !is_whiteout(&chk.st))
@@ -234,7 +240,7 @@ out:
static int ovl_check_opaque(struct scan_ctx *sctx)
{
const char *pathname = sctx->pathname;
- char parent_path[PATH_MAX];
+ char parent[PATH_MAX];
struct ovl_lower_check chk = {0};
unsigned int start;
int ret = 0;
@@ -252,15 +258,17 @@ static int ovl_check_opaque(struct scan_ctx *sctx)
* check if there is a file or dir with the same name.
*/
start = (sctx->dirtype == OVL_LOWER) ? sctx->num + 1 : 0;
- ret = ovl_check_lower(pathname + sctx->dirlen, start, &chk, true);
+ ret = ovl_check_lower(path_pick(pathname, sctx->dirlen),
+ start, &chk, true);
if (ret)
return ret;
if (chk.exist && !is_whiteout(&chk.st))
goto out;
/* Check parent directory merged or pure */
- memcpy(parent_path, pathname, sctx->pathlen-sctx->filelen);
- ret = ovl_check_lower(parent_path + sctx->dirlen, start, &chk, false);
+ path_truncate(parent, sizeof(parent), pathname, sctx->filename);
+ ret = ovl_check_lower(path_pick(parent, sctx->dirlen),
+ start, &chk, false);
if (ret)
return ret;
if (chk.exist && is_dir(&chk.st))
@@ -396,8 +404,8 @@ static int ovl_check_redirect(struct scan_ctx *sctx)
sctx->num, chk.path);
/* Check and fix whiteout or opaque dir */
- snprintf(redirect_rpath, sizeof(redirect_rpath), "%s%s",
- sctx->dirname, redirect);
+ path_pack(redirect_rpath, sizeof(redirect_rpath),
+ sctx->dirname, redirect);
if (lstat(redirect_rpath, &rst) != 0) {
if (errno != ENOENT && errno != ENOTDIR) {
print_err(_("Cannot stat %s: %s\n"),
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 06/18] fsck.overlay: open lowerdirs in advance
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (4 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 05/18] fsck.overlay: convert path parse to use helper function zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 07/18] fsck.overlay: check lowers use relative path zhangyi (F)
` (12 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Now, we use absolute path and lstat() to get directory and file's stat
when scaning each lower directories. So we need to package lower path
to absolute path every time.
This patch check fd counts and open each lower root path in advice,
prepare for invoking fstatat() with relative path instead of absolute path.
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
fsck.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
lib.h | 3 +++
2 files changed, 88 insertions(+), 6 deletions(-)
diff --git a/fsck.c b/fsck.c
index f4c806b..0a84903 100644
--- a/fsck.c
+++ b/fsck.c
@@ -13,8 +13,12 @@
#include <getopt.h>
#include <libgen.h>
#include <stdbool.h>
+#include <fcntl.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#include <linux/limits.h>
#include "common.h"
@@ -28,22 +32,80 @@ char *program_name;
char **lowerdir = NULL;
char upperdir[PATH_MAX] = {0};
char workdir[PATH_MAX] = {0};
+int *lowerfd = NULL;
unsigned int lower_num = 0;
int flags = 0; /* user input option flags */
int status = 0; /* fsck scan status */
+/* Open lower dirs */
+static int ovl_open_lowerdirs(void)
+{
+ unsigned int i;
+ struct rlimit rlim;
+ rlim_t rlim_need = lower_num + NOFILE_BASE;
+
+ /* If RLIMIT_NOFILE limit is small than we need, try to expand limit */
+ if ((getrlimit(RLIMIT_NOFILE, &rlim))) {
+ print_err(_("Failed to getrlimit:%s\n"), strerror(errno));
+ return -1;
+ }
+ print_debug(_("Open softlimit=%lu, hardlimit=%lu, need=%lu\n"),
+ rlim.rlim_cur, rlim.rlim_max, rlim_need);
+
+ if (rlim.rlim_cur < rlim_need) {
+ rlim.rlim_cur = rlim_need;
+ rlim.rlim_max = rlim.rlim_cur < rlim.rlim_max ?
+ rlim.rlim_max : rlim.rlim_cur;
+ if ((setrlimit(RLIMIT_NOFILE, &rlim))) {
+ print_err(_("Failed to setrlimit:%s\n"), strerror(errno));
+ print_info(_("Open fd number limit=%lu too small, need %lu\n"),
+ rlim.rlim_max, rlim_need);
+ return -1;
+ }
+ }
+
+ lowerfd = smalloc(lower_num * sizeof(int));
+ for (i = 0; i < lower_num; i++) {
+ lowerfd[i] = open(lowerdir[i],
+ O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC);
+ if (lowerfd[i] < 0) {
+ print_err(_("Failed to open %s:%s\n"),
+ lowerdir[i], strerror(errno));
+ goto err;
+ }
+ }
+
+ return 0;
+err:
+ for (i--; i >= 0; i--) {
+ close(lowerfd[i]);
+ lowerfd[i] = 0;
+ }
+ free(lowerfd);
+ lowerfd = NULL;
+ return -1;
+}
+
/* Cleanup lower directories buf */
static void ovl_clean_lowerdirs(void)
{
unsigned int i;
for (i = 0; i < lower_num; i++) {
+ if (lowerfd && lowerfd[i]) {
+ close(lowerfd[i]);
+ lowerfd[i] = 0;
+ }
free(lowerdir[i]);
lowerdir[i] = NULL;
- lower_num = 0;
+ }
+ if (lowerfd) {
+ free(lowerfd);
+ lowerfd = NULL;
}
free(lowerdir);
lowerdir = NULL;
+ lower_num = 0;
}
static void usage(void)
@@ -71,6 +133,7 @@ static void parse_options(int argc, char *argv[])
int c;
int ret = 0;
bool opt_conflict = false;
+ bool show_usage = false;
struct option long_options[] = {
{"lowerdir", required_argument, NULL, 'l'},
@@ -85,9 +148,14 @@ static void parse_options(int argc, char *argv[])
while ((c = getopt_long(argc, argv, "l:u:w:apnyvVh", long_options, NULL)) != -1) {
switch (c) {
case 'l':
+ if (lower_num)
+ ovl_clean_lowerdirs();
+
lowertemp = strdup(optarg);
ret = ovl_resolve_lowerdirs(lowertemp, &lowerdir, &lower_num);
free(lowertemp);
+ if (!ret)
+ ret = ovl_open_lowerdirs();
break;
case 'u':
if (realpath(optarg, upperdir)) {
@@ -139,18 +207,29 @@ static void parse_options(int argc, char *argv[])
}
if (ret)
- exit(1);
+ goto err_out;
}
if (!lower_num || (!(flags & FL_UPPER) && lower_num == 1)) {
- print_info(_("Please specify correct lowerdirs and upperdir\n"));
- usage();
+ print_info(_("Please specify correct lowerdirs and upperdir!\n\n"));
+ show_usage = true;
+ goto err_out;
}
if (opt_conflict) {
- print_info(_("Only one of the options -p/-a, -n or -y can be specified.\n"));
- usage();
+ print_info(_("Only one of the options -p/-a, -n or -y can be specified!\n\n"));
+ show_usage = true;
+ goto err_out;
}
+
+ return;
+
+err_out:
+ if (lower_num)
+ ovl_clean_lowerdirs();
+ if (show_usage)
+ usage();
+ exit(1);
}
void fsck_status_check(int *val)
diff --git a/lib.h b/lib.h
index 618791c..e389ed6 100644
--- a/lib.h
+++ b/lib.h
@@ -1,6 +1,9 @@
#ifndef OVL_LIB_H
#define OVL_LIB_H
+/* Open file descriptor number base limit */
+#define NOFILE_BASE 20 /* not contain lower directory's fd */
+
/* Common return value */
#define FSCK_OK 0 /* No errors */
#define FSCK_NONDESTRUCT 1 /* File system errors corrected */
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 07/18] fsck.overlay: check lowers use relative path
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (5 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 06/18] fsck.overlay: open lowerdirs in advance zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 08/18] fsck.overlay: fix spelling mistakes zhangyi (F)
` (11 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
instead of absolute path
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
check.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/check.c b/check.c
index add7e11..1d008cd 100644
--- a/check.c
+++ b/check.c
@@ -6,11 +6,13 @@
*
*/
+#define _GNU_SOURCE
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
+#include <fcntl.h>
#include <stdbool.h>
#include <sys/types.h>
#include <sys/xattr.h>
@@ -23,11 +25,9 @@
/* Underlying information */
struct ovl_lower_check {
- unsigned int type; /* check extent type */
-
bool exist;
- char path[PATH_MAX]; /* exist pathname found, only valid if exist */
- struct stat st; /* only valid if exist */
+ char path[PATH_MAX]; /* pathname found */
+ struct stat st; /* stat(2) information */
};
/* Redirect information */
@@ -48,6 +48,7 @@ struct ovl_redirect_entry {
extern char **lowerdir;
extern char upperdir[];
extern char workdir[];
+extern int *lowerfd;
extern unsigned int lower_num;
extern int flags;
extern int status;
@@ -144,23 +145,25 @@ static inline int ovl_create_whiteout(const char *pathname)
* Scan each lower dir lower than 'start' and check type matching,
* we stop scan if we found something.
*
- * skip: skip whiteout.
+ * pathname: path name relative to lower base directory
+ * start: which lower layer start to check
+ * skip: skip whiteout
*
*/
static int ovl_check_lower(const char *pathname, unsigned int start,
struct ovl_lower_check *chk, bool skip)
{
- char lower_path[PATH_MAX];
struct stat st;
unsigned int i;
for (i = start; i < lower_num; i++) {
- path_pack(lower_path, sizeof(lower_path), lowerdir[i], pathname);
+ if (fstatat(lowerfd[i], pathname, &st,
+ AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW) != 0) {
- if (lstat(lower_path, &st) != 0) {
if (errno != ENOENT && errno != ENOTDIR) {
- print_err(_("Cannot stat %s: %s\n"),
- lower_path, strerror(errno));
+ print_err(_("Cannot stat %s in %s: %s\n"),
+ pathname, lowerdir[i],
+ strerror(errno));
return -1;
}
continue;
@@ -169,7 +172,7 @@ static int ovl_check_lower(const char *pathname, unsigned int start,
if (skip && is_whiteout(&st))
continue;
- strncpy(chk->path, lower_path, sizeof(chk->path));
+ path_pack(chk->path, sizeof(chk->path), lowerdir[i], pathname);
chk->exist = true;
chk->st = st;
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 08/18] fsck.overlay: fix spelling mistakes
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (6 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 07/18] fsck.overlay: check lowers use relative path zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 9:13 ` Amir Goldstein
2017-12-14 6:47 ` [PATCH v2 09/18] fsck.overlay: add counter of checked objects zhangyi (F)
` (10 subsequent siblings)
18 siblings, 1 reply; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
check.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
mode change 100644 => 100755 check.c
diff --git a/check.c b/check.c
old mode 100644
new mode 100755
index 1d008cd..b26638e
--- a/check.c
+++ b/check.c
@@ -36,9 +36,9 @@ struct ovl_redirect_entry {
char origin[PATH_MAX]; /* origin directory path */
- char path[PATH_MAX]; /* redirect directory */
- int dirtype; /* OVL_UPPER or OVL_LOWER */
- int dirnum; /* only valid when dirtype==OVL_LOWER */
+ char path[PATH_MAX]; /* redirect directory path */
+ int dirtype; /* redirect directory layer type: OVL_UPPER or OVL_LOWER */
+ int dirnum; /* redirect directory layer num (only valid in OVL_LOWER) */
};
/* Whiteout */
@@ -307,14 +307,15 @@ static void ovl_redirect_entry_add(const char *path, int dirtype,
for (last = redirect_list; last->next; last = last->next);
last->next = new;
}
- new->next = NULL;
+
new->dirtype = dirtype;
new->dirnum = dirnum;
strncpy(new->origin, origin, sizeof(new->origin));
strncpy(new->path, path, sizeof(new->path));
+ new->next = NULL;
}
-static bool vol_redirect_entry_find(const char *origin, int dirtype,
+static bool ovl_redirect_entry_find(const char *origin, int dirtype,
int dirnum, char **founded)
{
struct ovl_redirect_entry *entry;
@@ -342,7 +343,7 @@ static bool vol_redirect_entry_find(const char *origin, int dirtype,
return false;
}
-static void vol_redirect_free(void)
+static void ovl_redirect_free(void)
{
struct ovl_redirect_entry *entry;
@@ -394,10 +395,10 @@ static int ovl_check_redirect(struct scan_ctx *sctx)
char *tmp;
/* Check duplicate in same layer */
- if (vol_redirect_entry_find(chk.path, sctx->dirtype,
+ if (ovl_redirect_entry_find(chk.path, sctx->dirtype,
sctx->num, &tmp)) {
print_info("Duplicate redirect directories found:\n");
- print_info("origin:%s current:%s latest:%s\n",
+ print_info("origin:%s current:%s last:%s\n",
chk.path, pathname, tmp);
set_st_inconsistency(&status);
@@ -448,7 +449,7 @@ static struct scan_operations ovl_scan_ops = {
static void ovl_scan_clean(void)
{
/* Clean redirect entry record */
- vol_redirect_free();
+ ovl_redirect_free();
}
/* Scan upperdir and each lowerdirs, check and fix inconsistency */
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* Re: [PATCH v2 08/18] fsck.overlay: fix spelling mistakes
2017-12-14 6:47 ` [PATCH v2 08/18] fsck.overlay: fix spelling mistakes zhangyi (F)
@ 2017-12-14 9:13 ` Amir Goldstein
0 siblings, 0 replies; 47+ messages in thread
From: Amir Goldstein @ 2017-12-14 9:13 UTC (permalink / raw)
To: zhangyi (F)
Cc: overlayfs, fstests, Miklos Szeredi, Eryu Guan, Darrick J. Wong, Miao Xie
On Thu, Dec 14, 2017 at 8:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
Did you intend to send this patch for review??
You should rebase and squash changes like these even when not posting
for a brand new repository.
> ---
> check.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
> mode change 100644 => 100755 check.c
>
> diff --git a/check.c b/check.c
> old mode 100644
> new mode 100755
> index 1d008cd..b26638e
> --- a/check.c
> +++ b/check.c
> @@ -36,9 +36,9 @@ struct ovl_redirect_entry {
>
> char origin[PATH_MAX]; /* origin directory path */
>
> - char path[PATH_MAX]; /* redirect directory */
> - int dirtype; /* OVL_UPPER or OVL_LOWER */
> - int dirnum; /* only valid when dirtype==OVL_LOWER */
> + char path[PATH_MAX]; /* redirect directory path */
> + int dirtype; /* redirect directory layer type: OVL_UPPER or OVL_LOWER */
> + int dirnum; /* redirect directory layer num (only valid in OVL_LOWER) */
> };
>
> /* Whiteout */
> @@ -307,14 +307,15 @@ static void ovl_redirect_entry_add(const char *path, int dirtype,
> for (last = redirect_list; last->next; last = last->next);
> last->next = new;
> }
> - new->next = NULL;
> +
> new->dirtype = dirtype;
> new->dirnum = dirnum;
> strncpy(new->origin, origin, sizeof(new->origin));
> strncpy(new->path, path, sizeof(new->path));
> + new->next = NULL;
> }
>
> -static bool vol_redirect_entry_find(const char *origin, int dirtype,
> +static bool ovl_redirect_entry_find(const char *origin, int dirtype,
> int dirnum, char **founded)
> {
> struct ovl_redirect_entry *entry;
> @@ -342,7 +343,7 @@ static bool vol_redirect_entry_find(const char *origin, int dirtype,
> return false;
> }
>
> -static void vol_redirect_free(void)
> +static void ovl_redirect_free(void)
> {
> struct ovl_redirect_entry *entry;
>
> @@ -394,10 +395,10 @@ static int ovl_check_redirect(struct scan_ctx *sctx)
> char *tmp;
>
> /* Check duplicate in same layer */
> - if (vol_redirect_entry_find(chk.path, sctx->dirtype,
> + if (ovl_redirect_entry_find(chk.path, sctx->dirtype,
> sctx->num, &tmp)) {
> print_info("Duplicate redirect directories found:\n");
> - print_info("origin:%s current:%s latest:%s\n",
> + print_info("origin:%s current:%s last:%s\n",
> chk.path, pathname, tmp);
>
> set_st_inconsistency(&status);
> @@ -448,7 +449,7 @@ static struct scan_operations ovl_scan_ops = {
> static void ovl_scan_clean(void)
> {
> /* Clean redirect entry record */
> - vol_redirect_free();
> + ovl_redirect_free();
> }
>
> /* Scan upperdir and each lowerdirs, check and fix inconsistency */
> --
> 2.9.5
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* [PATCH v2 09/18] fsck.overlay: add counter of checked objects
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (7 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 08/18] fsck.overlay: fix spelling mistakes zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 10/18] fsck.overlay: fix verbose flag zhangyi (F)
` (9 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Count files, sub-directories, whiteouts, opaque directories, redirect
directories (total/invalid/delete/creat) when scaning and fixing
underlying directories of overlayfs. Warn user if any invalid left after
fsck.
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
check.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
lib.c | 5 ++++-
lib.h | 14 ++++++++++++++
3 files changed, 78 insertions(+), 4 deletions(-)
mode change 100755 => 100644 check.c
diff --git a/check.c b/check.c
old mode 100755
new mode 100644
index b26638e..b3a8607
--- a/check.c
+++ b/check.c
@@ -199,6 +199,8 @@ static int ovl_check_whiteout(struct scan_ctx *sctx)
if (!is_whiteout(st))
return 0;
+ sctx->whiteouts[SC_TOTAL]++;
+
/* Is Whiteout in the bottom lower dir ? */
if (sctx->dirtype == OVL_LOWER && sctx->num == lower_num-1)
goto remove;
@@ -216,6 +218,7 @@ static int ovl_check_whiteout(struct scan_ctx *sctx)
goto out;
remove:
+ sctx->whiteouts[SC_INVALID]++;
/* Remove orphan whiteout directly or ask user */
print_info(_("Orphan whiteout: %s "), pathname);
if (!ask_question("Remove", 1))
@@ -227,6 +230,7 @@ remove:
strerror(errno));
return ret;
}
+ sctx->whiteouts[SC_INVALID_DEL]++;
out:
return ret;
}
@@ -252,6 +256,8 @@ static int ovl_check_opaque(struct scan_ctx *sctx)
if (!ovl_is_opaque(pathname))
goto out;
+ sctx->opaques[SC_TOTAL]++;
+
/* Opaque dir in last lower dir ? */
if (sctx->dirtype == OVL_LOWER && sctx->num == lower_num-1)
goto remove;
@@ -278,12 +284,15 @@ static int ovl_check_opaque(struct scan_ctx *sctx)
goto out;
remove:
+ sctx->opaques[SC_INVALID]++;
/* Remove opaque xattr or ask user */
print_info(_("Invalid opaque xattr: %s "), pathname);
if (!ask_question("Remove", 1))
return 0;
ret = ovl_remove_opaque(pathname);
+ if (!ret)
+ sctx->opaques[SC_INVALID_DEL]++;
out:
return ret;
}
@@ -381,6 +390,7 @@ static int ovl_check_redirect(struct scan_ctx *sctx)
return ret;
print_debug(_("Dir %s has redirect %s\n"), pathname, redirect);
+ sctx->redirects[SC_TOTAL]++;
/* Redirect dir in last lower dir ? */
if (sctx->dirtype == OVL_LOWER && sctx->num == lower_num-1)
@@ -401,6 +411,7 @@ static int ovl_check_redirect(struct scan_ctx *sctx)
print_info("origin:%s current:%s last:%s\n",
chk.path, pathname, tmp);
+ sctx->redirects[SC_INVALID]++;
set_st_inconsistency(&status);
}
@@ -418,23 +429,34 @@ static int ovl_check_redirect(struct scan_ctx *sctx)
}
/* Found nothing, create a whiteout */
- ret = ovl_create_whiteout(redirect_rpath);
+ if ((ret = ovl_create_whiteout(redirect_rpath)))
+ goto out;
+
+ sctx->whiteouts[SC_CREATE]++;
+ sctx->whiteouts[SC_TOTAL]++;
} else if (is_dir(&rst) && !ovl_is_opaque(redirect_rpath)) {
/* Found a directory but not opaqued, fix opaque xattr */
- ret = ovl_set_opaque(redirect_rpath);
+ if ((ret = ovl_set_opaque(redirect_rpath)))
+ goto out;
+
+ sctx->opaques[SC_CREATE]++;
+ sctx->opaques[SC_TOTAL]++;
}
goto out;
}
remove:
+ sctx->redirects[SC_INVALID]++;
/* Remove redirect xattr or ask user */
print_info(_("Invalid redirect xattr: %s "), pathname);
if (!ask_question("Remove", 1))
goto out;
ret = ovl_remove_redirect(pathname);
+ if (!ret)
+ sctx->redirects[SC_INVALID_DEL]++;
out:
free(redirect);
return ret;
@@ -446,6 +468,40 @@ static struct scan_operations ovl_scan_ops = {
.redirect = ovl_check_redirect,
};
+static void ovl_scan_report(struct scan_ctx *sctx)
+{
+ int i_whiteouts, i_opaques, i_redirects;
+
+ if (flags | FL_VERBOSE) {
+ print_info(_("Scan %d directories, %d files\n"),
+ sctx->directories, sctx->files);
+ print_info(_("Whiteouts: %d/%d/%d/%d [Total/Invalid/Deleted/Create]\n"),
+ sctx->whiteouts[SC_TOTAL], sctx->whiteouts[SC_INVALID],
+ sctx->whiteouts[SC_INVALID_DEL], sctx->whiteouts[SC_CREATE]);
+ print_info(_("Opaque directories: %d/%d/%d/%d [Total/Invalid/Deleted/Create]\n"),
+ sctx->opaques[SC_TOTAL], sctx->opaques[SC_INVALID],
+ sctx->opaques[SC_INVALID_DEL], sctx->opaques[SC_CREATE]);
+ print_info(_("Redirect directories: %d/%d/%d/%d [Total/Invalid/Deleted/Create]\n"),
+ sctx->redirects[SC_TOTAL], sctx->redirects[SC_INVALID],
+ sctx->redirects[SC_INVALID_DEL], sctx->redirects[SC_CREATE]);
+ }
+
+ i_whiteouts = sctx->whiteouts[SC_INVALID] - sctx->whiteouts[SC_INVALID_DEL];
+ i_opaques = sctx->opaques[SC_INVALID] - sctx->opaques[SC_INVALID_DEL];
+ i_redirects = sctx->redirects[SC_INVALID] - sctx->redirects[SC_INVALID_DEL];
+
+ if (i_whiteouts)
+ print_info(_("Invalid whiteouts %d left!\n"), i_whiteouts);
+ else if (i_opaques)
+ print_info(_("Invalid opaque directories %d left!\n"), i_opaques);
+ else if (i_redirects)
+ print_info(_("Invalid redirect directories %d left!\n"), i_redirects);
+ else
+ return;
+
+ set_st_inconsistency(&status);
+}
+
static void ovl_scan_clean(void)
{
/* Clean redirect entry record */
@@ -455,7 +511,7 @@ static void ovl_scan_clean(void)
/* Scan upperdir and each lowerdirs, check and fix inconsistency */
int ovl_scan_fix(void)
{
- struct scan_ctx sctx;
+ struct scan_ctx sctx = {0};
unsigned int i;
int ret = 0;
@@ -489,6 +545,7 @@ int ovl_scan_fix(void)
goto out;
}
out:
+ ovl_scan_report(&sctx);
ovl_scan_clean();
return ret;
}
diff --git a/lib.c b/lib.c
index ecc5d27..7495af5 100644
--- a/lib.c
+++ b/lib.c
@@ -198,7 +198,6 @@ int scan_dir(struct scan_ctx *sctx, struct scan_operations *sop)
ftsent->fts_level, ftsent->fts_statp->st_size,
ftsent->fts_path, ftsent->fts_name);
-
/* Fillup base context */
sctx->pathname = ftsent->fts_path;
sctx->pathlen = ftsent->fts_pathlen;
@@ -207,6 +206,9 @@ int scan_dir(struct scan_ctx *sctx, struct scan_operations *sop)
sctx->st = ftsent->fts_statp;
switch (ftsent->fts_info) {
+ case FTS_F:
+ sctx->files++;
+ break;
case FTS_DEFAULT:
/* Check whiteouts */
err = __check_entry(sctx, sop->whiteout);
@@ -214,6 +216,7 @@ int scan_dir(struct scan_ctx *sctx, struct scan_operations *sop)
break;
case FTS_D:
/* Check opaque and redirect */
+ sctx->directories++;
err = __check_entry(sctx, sop->opaque);
ret = (ret || !err) ? ret : err;
diff --git a/lib.h b/lib.h
index e389ed6..0f0b526 100644
--- a/lib.h
+++ b/lib.h
@@ -38,6 +38,14 @@
#define OVL_OPAQUE_XATTR "trusted.overlay.opaque"
#define OVL_REDIRECT_XATTR "trusted.overlay.redirect"
+enum scan_count_type {
+ SC_TOTAL = 0, /* total check num */
+ SC_INVALID, /* total invalid num */
+ SC_INVALID_DEL, /* deleted invalid num */
+ SC_CREATE, /* create num */
+ SC_MAX,
+};
+
/* Directories scan data struct */
struct scan_ctx {
const char *dirname; /* upper/lower root dir */
@@ -50,6 +58,12 @@ struct scan_ctx {
const char *filename; /* filename */
size_t filelen; /* strlen(filename) */
struct stat *st; /* file stat */
+
+ int files;
+ int directories;
+ int whiteouts[SC_MAX];
+ int redirects[SC_MAX];
+ int opaques[SC_MAX];
};
/* Directories scan callback operations struct */
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 10/18] fsck.overlay: fix verbose flag
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (8 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 09/18] fsck.overlay: add counter of checked objects zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 11/18] fsck.overlay: add ovl_ask_invalid helper zhangyi (F)
` (8 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
check.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/check.c b/check.c
index b3a8607..0b2e303 100644
--- a/check.c
+++ b/check.c
@@ -472,7 +472,7 @@ static void ovl_scan_report(struct scan_ctx *sctx)
{
int i_whiteouts, i_opaques, i_redirects;
- if (flags | FL_VERBOSE) {
+ if (flags & FL_VERBOSE) {
print_info(_("Scan %d directories, %d files\n"),
sctx->directories, sctx->files);
print_info(_("Whiteouts: %d/%d/%d/%d [Total/Invalid/Deleted/Create]\n"),
@@ -515,11 +515,11 @@ int ovl_scan_fix(void)
unsigned int i;
int ret = 0;
- if (flags | FL_VERBOSE)
+ if (flags & FL_VERBOSE)
print_info(_("Scan and fix: [whiteouts|opaque|redirectdir]\n"));
/* Scan upper directory */
- if (flags | FL_VERBOSE)
+ if (flags & FL_VERBOSE)
print_info(_("Scan upper directory: %s\n"), upperdir);
sctx.dirname = upperdir;
@@ -532,7 +532,7 @@ int ovl_scan_fix(void)
/* Scan every lower directories */
for (i = 0; i < lower_num; i++) {
- if (flags | FL_VERBOSE)
+ if (flags & FL_VERBOSE)
print_info(_("Scan upper directory: %s\n"), lowerdir[i]);
sctx.dirname = lowerdir[i];
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 11/18] fsck.overlay: add ovl_ask_invalid helper
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (9 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 10/18] fsck.overlay: fix verbose flag zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 12/18] fsck.overlay: remove duplicate redirect xattr in yes mode zhangyi (F)
` (7 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
check.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/check.c b/check.c
index 0b2e303..99cd95a 100644
--- a/check.c
+++ b/check.c
@@ -141,6 +141,14 @@ static inline int ovl_create_whiteout(const char *pathname)
return ret;
}
+static inline int ovl_ask_invalid(const char *question, const char *pathname,
+ int action)
+{
+ print_info(_("%s: %s "), question, pathname);
+
+ return ask_question("Remove", action);
+}
+
/*
* Scan each lower dir lower than 'start' and check type matching,
* we stop scan if we found something.
@@ -219,9 +227,9 @@ static int ovl_check_whiteout(struct scan_ctx *sctx)
remove:
sctx->whiteouts[SC_INVALID]++;
+
/* Remove orphan whiteout directly or ask user */
- print_info(_("Orphan whiteout: %s "), pathname);
- if (!ask_question("Remove", 1))
+ if (!ovl_ask_invalid("Orphan whiteout", pathname, 1))
return 0;
ret = unlink(pathname);
@@ -285,9 +293,9 @@ static int ovl_check_opaque(struct scan_ctx *sctx)
remove:
sctx->opaques[SC_INVALID]++;
+
/* Remove opaque xattr or ask user */
- print_info(_("Invalid opaque xattr: %s "), pathname);
- if (!ask_question("Remove", 1))
+ if (!ovl_ask_invalid("Invalid opaque xattr", pathname, 1))
return 0;
ret = ovl_remove_opaque(pathname);
@@ -449,9 +457,9 @@ static int ovl_check_redirect(struct scan_ctx *sctx)
remove:
sctx->redirects[SC_INVALID]++;
+
/* Remove redirect xattr or ask user */
- print_info(_("Invalid redirect xattr: %s "), pathname);
- if (!ask_question("Remove", 1))
+ if (!ovl_ask_invalid("Invalid redirect xattr", pathname, 1))
goto out;
ret = ovl_remove_redirect(pathname);
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 12/18] fsck.overlay: remove duplicate redirect xattr in yes mode
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (10 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 11/18] fsck.overlay: add ovl_ask_invalid helper zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 13/18] fsck.overlay: handle missing case of redirecte directory zhangyi (F)
` (6 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
For the duplicate redirect directories which point to the same origin,
we cannot confirm which one is invalid now, so cannot remove it in 'auto'
mode for safty reason. But in 'yes' mode, we remove the duplicate one
directly for consistency.
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
check.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/check.c b/check.c
index 99cd95a..1e40cac 100644
--- a/check.c
+++ b/check.c
@@ -378,7 +378,8 @@ static void ovl_redirect_free(void)
* 1) Check the origin directory exist or not. If not, remove xattr.
* 2) Count how many directories the origin directory was redirected by.
* If more than one in the same layer, there must be some inconsistency
- * but not sure, just warn.
+ * but not sure which one is invalid, just warn in 'auto' mode and remove
+ * the duplicate one in 'yes' mode.
* 3) Check and fix the missing whiteout or opaque in redierct parent dir.
*/
static int ovl_check_redirect(struct scan_ctx *sctx)
@@ -420,7 +421,11 @@ static int ovl_check_redirect(struct scan_ctx *sctx)
chk.path, pathname, tmp);
sctx->redirects[SC_INVALID]++;
- set_st_inconsistency(&status);
+
+ /* Don't remove in auto mode */
+ if (ovl_ask_invalid("Duplicate redirect xattr",
+ pathname, 0))
+ goto remove_d;
}
ovl_redirect_entry_add(pathname, sctx->dirtype,
@@ -461,7 +466,7 @@ remove:
/* Remove redirect xattr or ask user */
if (!ovl_ask_invalid("Invalid redirect xattr", pathname, 1))
goto out;
-
+remove_d:
ret = ovl_remove_redirect(pathname);
if (!ret)
sctx->redirects[SC_INVALID_DEL]++;
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 13/18] fsck.overlay: handle missing case of redirecte directory
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (11 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 12/18] fsck.overlay: remove duplicate redirect xattr in yes mode zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 14/18] fsck.overlay: correct copyright and License zhangyi (F)
` (5 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
When we find a valid reidrect dir, the lower redirect target must
be covered by a whiteout or an opaque dir or an other redirect dir.
This patch handle the missing case of another redirect dir. At the
same time, when we remove an invalid redirect xattr, we should also
consider to fix the opaque xattr for this case.
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
check.c | 46 +++++++++++++++++++++++++++++++++++++++-------
1 file changed, 39 insertions(+), 7 deletions(-)
diff --git a/check.c b/check.c
index 1e40cac..ca75358 100644
--- a/check.c
+++ b/check.c
@@ -130,6 +130,16 @@ static inline int ovl_remove_redirect(const char *pathname)
return remove_xattr(pathname, OVL_REDIRECT_XATTR);
}
+/* Just check exists */
+static inline bool ovl_is_redirect(const char *pathname)
+{
+ bool exist = false;
+ ssize_t ret;
+
+ ret = get_xattr(pathname, OVL_REDIRECT_XATTR, NULL, &exist);
+ return ret ? false : exist;
+}
+
static inline int ovl_create_whiteout(const char *pathname)
{
int ret;
@@ -380,7 +390,11 @@ static void ovl_redirect_free(void)
* If more than one in the same layer, there must be some inconsistency
* but not sure which one is invalid, just warn in 'auto' mode and remove
* the duplicate one in 'yes' mode.
- * 3) Check and fix the missing whiteout or opaque in redierct parent dir.
+ * 3) Check and fix the missing whiteout or opaque in redierct parent directory
+ * if there is no another redirected upper directory covering the redirect
+ * lower target.
+ * When a redirect xattr is removed, and the lower layers have directory with
+ * same name, add opaque to cover it.
*/
static int ovl_check_redirect(struct scan_ctx *sctx)
{
@@ -402,8 +416,10 @@ static int ovl_check_redirect(struct scan_ctx *sctx)
sctx->redirects[SC_TOTAL]++;
/* Redirect dir in last lower dir ? */
- if (sctx->dirtype == OVL_LOWER && sctx->num == lower_num-1)
+ if (sctx->dirtype == OVL_LOWER && sctx->num == lower_num-1) {
+ start = lower_num;
goto remove;
+ }
/* Scan lower directories to check redirect dir exist or not */
start = (sctx->dirtype == OVL_LOWER) ? sctx->num + 1 : 0;
@@ -448,8 +464,15 @@ static int ovl_check_redirect(struct scan_ctx *sctx)
sctx->whiteouts[SC_CREATE]++;
sctx->whiteouts[SC_TOTAL]++;
- } else if (is_dir(&rst) && !ovl_is_opaque(redirect_rpath)) {
- /* Found a directory but not opaqued, fix opaque xattr */
+ } else if (is_dir(&rst) && !ovl_is_opaque(redirect_rpath) &&
+ !ovl_is_redirect(redirect_rpath)) {
+ /*
+ * Found a directory but not opaqued and not
+ * redirected, fix the opaque xattr. Note that we
+ * don't check redirect validity here, the opaque
+ * will be fixed if it's invalid when we remove it
+ * later.
+ */
if ((ret = ovl_set_opaque(redirect_rpath)))
goto out;
@@ -467,9 +490,18 @@ remove:
if (!ovl_ask_invalid("Invalid redirect xattr", pathname, 1))
goto out;
remove_d:
- ret = ovl_remove_redirect(pathname);
- if (!ret)
- sctx->redirects[SC_INVALID_DEL]++;
+ if ((ret = ovl_remove_redirect(pathname)))
+ goto out;
+
+ sctx->redirects[SC_INVALID_DEL]++;
+
+ /* If lower directory exist, create opaque xattr to cover it */
+ if (start < lower_num) {
+ if ((ret = ovl_check_lower(pathname, start, &chk, false)))
+ goto out;
+ if (chk.exist && is_dir(&chk.st))
+ ret = ovl_set_opaque(pathname);
+ }
out:
free(redirect);
return ret;
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 14/18] fsck.overlay: correct copyright and License
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (12 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 13/18] fsck.overlay: handle missing case of redirecte directory zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 9:09 ` Amir Goldstein
2017-12-14 6:47 ` [PATCH v2 15/18] fsck.overlay: fix word mistake zhangyi (F)
` (4 subsequent siblings)
18 siblings, 1 reply; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
check.c | 17 +++++++++++++++--
check.h | 18 ++++++++++++++++++
common.c | 16 ++++++++++++++--
common.h | 18 ++++++++++++++++++
config.h | 18 ++++++++++++++++++
fsck.c | 17 +++++++++++++++--
lib.c | 17 +++++++++++++++--
lib.h | 18 ++++++++++++++++++
mount.c | 17 +++++++++++++++--
mount.h | 18 ++++++++++++++++++
10 files changed, 164 insertions(+), 10 deletions(-)
diff --git a/check.c b/check.c
index ca75358..7e07b66 100644
--- a/check.c
+++ b/check.c
@@ -1,11 +1,24 @@
/*
+ * check.c - Check and fix inconsistency for all underlying layers of overlay
*
- * Check and fix inconsistency for all underlying layers of overlay
+ * Copyright (c) 2017 Huawei. All Rights Reserved.
+ * Author: zhangyi (F) <yi.zhang@huawei.com>
*
- * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
*
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#define _GNU_SOURCE
#include <stdlib.h>
#include <stdio.h>
diff --git a/check.h b/check.h
index 373ff3a..6af8c2d 100644
--- a/check.h
+++ b/check.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2017 Huawei. All Rights Reserved.
+ * Author: zhangyi (F) <yi.zhang@huawei.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#ifndef OVL_WHITECHECK_H
#define OVL_WHITECHECK_H
diff --git a/common.c b/common.c
index 4e77045..904db58 100644
--- a/common.c
+++ b/common.c
@@ -1,9 +1,21 @@
/*
+ * common.c - Common things for all utilities
*
- * Common things for all utilities
+ * Copyright (c) 2017 Huawei. All Rights Reserved.
+ * Author: zhangyi (F) <yi.zhang@huawei.com>
*
- * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
*
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdio.h>
diff --git a/common.h b/common.h
index c4707e7..c93b7a6 100644
--- a/common.h
+++ b/common.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2017 Huawei. All Rights Reserved.
+ * Author: zhangyi (F) <yi.zhang@huawei.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#ifndef OVL_COMMON_H
#define OVL_COMMON_H
diff --git a/config.h b/config.h
index deac089..fa7eafa 100644
--- a/config.h
+++ b/config.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2017 Huawei. All Rights Reserved.
+ * Author: zhangyi (F) <yi.zhang@huawei.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#ifndef OVL_CONFIG_H
#define OVL_CONFIG_H
diff --git a/fsck.c b/fsck.c
index 0a84903..56a5286 100644
--- a/fsck.c
+++ b/fsck.c
@@ -1,11 +1,24 @@
/*
+ * fsck.c - Utility to fsck overlay
*
- * Utility to fsck overlay
+ * Copyright (c) 2017 Huawei. All Rights Reserved.
+ * Author: zhangyi (F) <yi.zhang@huawei.com>
*
- * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
*
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib.c b/lib.c
index 7495af5..00ec81f 100644
--- a/lib.c
+++ b/lib.c
@@ -1,11 +1,24 @@
/*
+ * lib.c - Common things for all utilities
*
- * Common things for all utilities
+ * Copyright (c) 2017 Huawei. All Rights Reserved.
+ * Author: zhangyi (F) <yi.zhang@huawei.com>
*
- * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
*
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/lib.h b/lib.h
index 0f0b526..ebcc77c 100644
--- a/lib.h
+++ b/lib.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2017 Huawei. All Rights Reserved.
+ * Author: zhangyi (F) <yi.zhang@huawei.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#ifndef OVL_LIB_H
#define OVL_LIB_H
diff --git a/mount.c b/mount.c
index 768c7aa..10970d5 100644
--- a/mount.c
+++ b/mount.c
@@ -1,11 +1,24 @@
/*
+ * mount.c - Check mounted overlay
*
- * Check mounted overlay
+ * Copyright (c) 2017 Huawei. All Rights Reserved.
+ * Author: zhangyi (F) <yi.zhang@huawei.com>
*
- * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
*
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/mount.h b/mount.h
index 8a3762d..e65425c 100644
--- a/mount.h
+++ b/mount.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2017 Huawei. All Rights Reserved.
+ * Author: zhangyi (F) <yi.zhang@huawei.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#ifndef OVL_MOUNT_H
#define OVL_MOUNT_H
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* Re: [PATCH v2 14/18] fsck.overlay: correct copyright and License
2017-12-14 6:47 ` [PATCH v2 14/18] fsck.overlay: correct copyright and License zhangyi (F)
@ 2017-12-14 9:09 ` Amir Goldstein
0 siblings, 0 replies; 47+ messages in thread
From: Amir Goldstein @ 2017-12-14 9:09 UTC (permalink / raw)
To: zhangyi (F)
Cc: overlayfs, fstests, Miklos Szeredi, Eryu Guan, Darrick J. Wong, Miao Xie
On Thu, Dec 14, 2017 at 8:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
You don't want this implicit copyright change in the history of your
brand new repository.
Better fix the license in the original commit.
> ---
> check.c | 17 +++++++++++++++--
> check.h | 18 ++++++++++++++++++
> common.c | 16 ++++++++++++++--
> common.h | 18 ++++++++++++++++++
> config.h | 18 ++++++++++++++++++
> fsck.c | 17 +++++++++++++++--
> lib.c | 17 +++++++++++++++--
> lib.h | 18 ++++++++++++++++++
> mount.c | 17 +++++++++++++++--
> mount.h | 18 ++++++++++++++++++
> 10 files changed, 164 insertions(+), 10 deletions(-)
>
> diff --git a/check.c b/check.c
> index ca75358..7e07b66 100644
> --- a/check.c
> +++ b/check.c
> @@ -1,11 +1,24 @@
> /*
> + * check.c - Check and fix inconsistency for all underlying layers of overlay
> *
> - * Check and fix inconsistency for all underlying layers of overlay
> + * Copyright (c) 2017 Huawei. All Rights Reserved.
> + * Author: zhangyi (F) <yi.zhang@huawei.com>
> *
> - * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> */
>
> +
> #define _GNU_SOURCE
> #include <stdlib.h>
> #include <stdio.h>
> diff --git a/check.h b/check.h
> index 373ff3a..6af8c2d 100644
> --- a/check.h
> +++ b/check.h
> @@ -1,3 +1,21 @@
> +/*
> + * Copyright (c) 2017 Huawei. All Rights Reserved.
> + * Author: zhangyi (F) <yi.zhang@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> #ifndef OVL_WHITECHECK_H
> #define OVL_WHITECHECK_H
>
> diff --git a/common.c b/common.c
> index 4e77045..904db58 100644
> --- a/common.c
> +++ b/common.c
> @@ -1,9 +1,21 @@
> /*
> + * common.c - Common things for all utilities
> *
> - * Common things for all utilities
> + * Copyright (c) 2017 Huawei. All Rights Reserved.
> + * Author: zhangyi (F) <yi.zhang@huawei.com>
> *
> - * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> */
>
> #include <stdio.h>
> diff --git a/common.h b/common.h
> index c4707e7..c93b7a6 100644
> --- a/common.h
> +++ b/common.h
> @@ -1,3 +1,21 @@
> +/*
> + * Copyright (c) 2017 Huawei. All Rights Reserved.
> + * Author: zhangyi (F) <yi.zhang@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> #ifndef OVL_COMMON_H
> #define OVL_COMMON_H
>
> diff --git a/config.h b/config.h
> index deac089..fa7eafa 100644
> --- a/config.h
> +++ b/config.h
> @@ -1,3 +1,21 @@
> +/*
> + * Copyright (c) 2017 Huawei. All Rights Reserved.
> + * Author: zhangyi (F) <yi.zhang@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> #ifndef OVL_CONFIG_H
> #define OVL_CONFIG_H
>
> diff --git a/fsck.c b/fsck.c
> index 0a84903..56a5286 100644
> --- a/fsck.c
> +++ b/fsck.c
> @@ -1,11 +1,24 @@
> /*
> + * fsck.c - Utility to fsck overlay
> *
> - * Utility to fsck overlay
> + * Copyright (c) 2017 Huawei. All Rights Reserved.
> + * Author: zhangyi (F) <yi.zhang@huawei.com>
> *
> - * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> */
>
> +
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> diff --git a/lib.c b/lib.c
> index 7495af5..00ec81f 100644
> --- a/lib.c
> +++ b/lib.c
> @@ -1,11 +1,24 @@
> /*
> + * lib.c - Common things for all utilities
> *
> - * Common things for all utilities
> + * Copyright (c) 2017 Huawei. All Rights Reserved.
> + * Author: zhangyi (F) <yi.zhang@huawei.com>
> *
> - * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> */
>
> +
> #include <stdlib.h>
> #include <stdio.h>
> #include <unistd.h>
> diff --git a/lib.h b/lib.h
> index 0f0b526..ebcc77c 100644
> --- a/lib.h
> +++ b/lib.h
> @@ -1,3 +1,21 @@
> +/*
> + * Copyright (c) 2017 Huawei. All Rights Reserved.
> + * Author: zhangyi (F) <yi.zhang@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> #ifndef OVL_LIB_H
> #define OVL_LIB_H
>
> diff --git a/mount.c b/mount.c
> index 768c7aa..10970d5 100644
> --- a/mount.c
> +++ b/mount.c
> @@ -1,11 +1,24 @@
> /*
> + * mount.c - Check mounted overlay
> *
> - * Check mounted overlay
> + * Copyright (c) 2017 Huawei. All Rights Reserved.
> + * Author: zhangyi (F) <yi.zhang@huawei.com>
> *
> - * zhangyi (F) <yi.zhang@huawei.com> - Sponsored by Huawei CR
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> */
>
> +
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> diff --git a/mount.h b/mount.h
> index 8a3762d..e65425c 100644
> --- a/mount.h
> +++ b/mount.h
> @@ -1,3 +1,21 @@
> +/*
> + * Copyright (c) 2017 Huawei. All Rights Reserved.
> + * Author: zhangyi (F) <yi.zhang@huawei.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> #ifndef OVL_MOUNT_H
> #define OVL_MOUNT_H
>
> --
> 2.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 47+ messages in thread
* [PATCH v2 15/18] fsck.overlay: fix word mistake
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (13 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 14/18] fsck.overlay: correct copyright and License zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 16/18] fsck.overlay: remove test cases zhangyi (F)
` (3 subsequent siblings)
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
test/local.config | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/local.config b/test/local.config
index 990395f..21b25c2 100644
--- a/test/local.config
+++ b/test/local.config
@@ -10,7 +10,7 @@ export SOURCE_DIR=$PWD/src
# Overlayfs config
export LOWER_DIR="lower"
export UPPER_DIR="upper"
-export WORK_DIR="worker"
+export WORK_DIR="work"
export MERGE_DIR="merge"
export LOWER_DIR1="lower1"
-export WORK_DIR1="worker1"
+export WORK_DIR1="work1"
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 16/18] fsck.overlay: remove test cases
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (14 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 15/18] fsck.overlay: fix word mistake zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 9:11 ` Amir Goldstein
2017-12-14 6:47 ` [PATCH v2 17/18] fsck.overlay: not enforce overlayfs is offline in 'no changes' mode zhangyi (F)
` (2 subsequent siblings)
18 siblings, 1 reply; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Remove test cases for fsck.overlay, these cases will move to xfstests.
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
test/README.md | 12 ----
test/auto_test.sh | 46 -------------
test/clean.sh | 6 --
test/local.config | 16 -----
test/src/opaque_test.sh | 144 ----------------------------------------
test/src/prepare.sh | 15 -----
test/src/redirect_test.sh | 163 ----------------------------------------------
test/src/whiteout_test.sh | 63 ------------------
8 files changed, 465 deletions(-)
delete mode 100644 test/README.md
delete mode 100755 test/auto_test.sh
delete mode 100755 test/clean.sh
delete mode 100644 test/local.config
delete mode 100755 test/src/opaque_test.sh
delete mode 100755 test/src/prepare.sh
delete mode 100755 test/src/redirect_test.sh
delete mode 100755 test/src/whiteout_test.sh
diff --git a/test/README.md b/test/README.md
deleted file mode 100644
index 71dbad8..0000000
--- a/test/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-fsck.overlay test
-=================
-
-This test cases simulate different inconsistency of overlay filesystem
-underlying directories, test fsck.overlay can repair them correctly or not.
-
-USAGE
-=====
-
-1. Check "local.config", modify config value to appropriate one.
-2. ./auto_test.sh
-3. After testing, the result file and log file created in the result directory.
diff --git a/test/auto_test.sh b/test/auto_test.sh
deleted file mode 100755
index 8248e24..0000000
--- a/test/auto_test.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. ./src/prepare.sh
-
-echo "***************"
-
-# 1. Test whiteout
-echo -e "1.Test Whiteout\n"
-$SOURCE_DIR/whiteout_test.sh >> $LOG_FILE 2>&1
-if [ $? -ne 0 ]; then
- echo -e "Result:\033[31m Fail\033[0m\n"
- RESULT="Fail"
-else
- echo -e "Result:\033[32m Pass\033[0m\n"
- RESULT="Pass"
-fi
-
-echo -e "Test whiteout: $RESULT" >> $RESOULT_FILE
-
-# 2. Test opaque dir
-echo -e "2.Test opaque directory\n"
-$SOURCE_DIR/opaque_test.sh >> $LOG_FILE 2>&1
-if [ $? -ne 0 ]; then
- echo -e "Result:\033[31m Fail\033[0m\n"
- RESULT="Fail"
-else
- echo -e "Result:\033[32m Pass\033[0m\n"
- RESULT="Pass"
-fi
-
-echo -e "Test opaque directory: $RESULT" >> $RESOULT_FILE
-
-# 3. Test redirect dir
-echo -e "3.Test redirect direcotry\n"
-$SOURCE_DIR/redirect_test.sh >> $LOG_FILE 2>&1
-if [ $? -ne 0 ]; then
- echo -e "Result:\033[31m Fail\033[0m\n"
- RESULT="Fail"
-else
- echo -e "Result:\033[32m Pass\033[0m\n"
- RESULT="Pass"
-fi
-
-echo -e "Test redirect direcotry: $RESULT" >> $RESOULT_FILE
-
-echo "***************"
diff --git a/test/clean.sh b/test/clean.sh
deleted file mode 100755
index 80f360b..0000000
--- a/test/clean.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-. ./src/prepare.sh
-
-rm -rf $RESULT_DIR
-rm -rf $TEST_DIR
diff --git a/test/local.config b/test/local.config
deleted file mode 100644
index 21b25c2..0000000
--- a/test/local.config
+++ /dev/null
@@ -1,16 +0,0 @@
-# Config
-export OVL_FSCK=fsck.overlay
-export TEST_DIR=/mnt/test
-
-# Base environment
-export PWD=`pwd`
-export RESULT_DIR=$PWD/result
-export SOURCE_DIR=$PWD/src
-
-# Overlayfs config
-export LOWER_DIR="lower"
-export UPPER_DIR="upper"
-export WORK_DIR="work"
-export MERGE_DIR="merge"
-export LOWER_DIR1="lower1"
-export WORK_DIR1="work1"
diff --git a/test/src/opaque_test.sh b/test/src/opaque_test.sh
deleted file mode 100755
index 7cb5030..0000000
--- a/test/src/opaque_test.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-
-. ./local.config
-
-__clean()
-{
- rm -rf $TEST_DIR/*
- cd $PWD
-}
-
-OVL_OPAQUE_XATTR="trusted.overlay.opaque"
-OVL_OPAQUE_XATTR_VAL="y"
-RET=0
-
-cd $TEST_DIR
-rm -rf *
-mkdir $LOWER_DIR $LOWER_DIR1 $UPPER_DIR $WORK_DIR
-
-# 1.Test lower invalid opaque directory
-echo "***** 1.Test lower invalid opaque directory *****"
-mkdir $LOWER_DIR/testdir
-setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir
-if [[ $? -eq 0 ]];then
- echo "ERROR: lower's invalid opaque xattr not remove"
- RET=$(($RET+1))
-fi
-rm -rf $LOWER_DIR/*
-
-# 2.Test upper invalid opaque directory
-echo "***** 2.Test upper invalid opaque directory *****"
-mkdir -p $UPPER_DIR/testdir0/testdir1
-setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir0/testdir1
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir0/testdir1
-if [[ $? -eq 0 ]];then
- echo "ERROR: upper's invalid opaque xattr not remove"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-
-# 3.Test upper opaque direcotry in merged directory
-echo "***** 3.Test upper opaque direcotry in merged directory *****"
-mkdir $UPPER_DIR/testdir
-setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
-if [[ $? -ne 0 ]];then
- echo "ERROR: upper's opaque xattr incorrect removed"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-
-# 4.Test upper opaque direcotry cover lower file
-echo "***** 4.Test upper opaque direcotry cover lower file *****"
-mkdir $UPPER_DIR/testdir
-mkdir $LOWER_DIR/testdir
-setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
-if [[ $? -ne 0 ]];then
- echo "ERROR: upper's opaque xattr incorrect removed"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-rm -rf $LOWER_DIR/*
-
-# 5.Test upper opaque direcotry cover lower directory
-echo "***** 5.Test upper opaque direcotry cover lower directory *****"
-mkdir $UPPER_DIR/testdir
-touch $LOWER_DIR/testdir
-setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
-if [[ $? -ne 0 ]];then
- echo "ERROR: upper's opaque xattr incorrect removed"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-rm -rf $LOWER_DIR/*
-
-# 6.Test lower invalid opaque directory in middle layer
-echo "***** 6.Test lower invalid opaque directory in middle layer *****"
-mkdir $LOWER_DIR/testdir0/testdir1
-setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir0/testdir1
-$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir0/testdir1
-if [[ $? -eq 0 ]];then
- echo "ERROR: middle's opaque xattr not removed"
- RET=$(($RET+1))
-fi
-rm -rf $LOWER_DIR/*
-
-# 7.Test lower invalid opaque directory in bottom layer
-echo "***** 7.Test lower invalid opaque directory in bottom layer *****"
-mkdir $LOWER_DIR1/testdir0/testdir1
-setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR1/testdir0/
-$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR1/testdir0/testdir1
-if [[ $? -eq 0 ]];then
- echo "ERROR: middle's opaque xattr not removed"
- RET=$(($RET+1))
-fi
-rm -rf $LOWER_DIR1/*
-
-# 8.Test middle opaque direcotry cover bottom directory
-echo "***** 8.Test middle opaque direcotry cover bottom directory *****"
-mkdir $LOWER_DIR1/testdir
-mkdir $LOWER_DIR/testdir
-setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir
-$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir
-if [[ $? -ne 0 ]];then
- echo "ERROR: middle's opaque xattr incorrect removed"
- RET=$(($RET+1))
-fi
-rm -rf $LOWER_DIR1/*
-rm -rf $LOWER_DIR/*
-
-# 9.Test double opaque direcotry in middle and upper layer
-echo "***** 9.Test double opaque direcotry in middle and upper layer *****"
-mkdir $LOWER_DIR1/testdir
-mkdir $LOWER_DIR/testdir
-mkdir $UPPER_DIR/testdir
-setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir
-setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
-$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir
-if [[ $? -ne 0 ]];then
- echo "ERROR: middle's opaque xattr incorrect removed"
- RET=$(($RET+1))
-fi
-getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
-if [[ $? -ne 0 ]];then
- echo "ERROR: upper's opaque xattr incorrect removed"
- RET=$(($RET+1))
-fi
-rm -rf $LOWER_DIR1/*
-rm -rf $LOWER_DIR/*
-rm -rf $UPPER_DIR/*
-
-__clean
-exit $RET
diff --git a/test/src/prepare.sh b/test/src/prepare.sh
deleted file mode 100755
index 138539a..0000000
--- a/test/src/prepare.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-. ./local.config
-
-NOW=`date +"%Y-%m-%d-%H-%M-%S"`
-LOG_FILE=$RESULT_DIR/LOG_${NOW}.log
-RESOULT_FILE=$RESULT_DIR/RESULT_${NOW}.out
-
-# creat test base dir
-if [ ! -d "$TEST_DIR" ]; then
- mkdir -p $TEST_DIR
-fi
-
-# creat result dir
-mkdir -p $RESULT_DIR
diff --git a/test/src/redirect_test.sh b/test/src/redirect_test.sh
deleted file mode 100755
index be2ce80..0000000
--- a/test/src/redirect_test.sh
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/bash
-
-. ./local.config
-
-__clean()
-{
- rm -rf $TEST_DIR/*
- cd $PWD
-}
-
-OVL_REDIRECT_XATTR="trusted.overlay.redirect"
-OVL_OPAQUE_XATTR="trusted.overlay.opaque"
-RET=0
-
-cd $TEST_DIR
-rm -rf *
-mkdir $LOWER_DIR $LOWER_DIR1 $UPPER_DIR $WORK_DIR
-
-# 1.Test no exist redirect origin
-echo "***** 1.Test no exist redirect origin *****"
-mkdir $UPPER_DIR/testdir
-setfattr -n $OVL_REDIRECT_XATTR -v "xxx" $UPPER_DIR/testdir
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
-if [[ $? -eq 0 ]];then
- echo "ERROR: upper's redirect xattr not remove"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-
-# 2.Test redirect origin is file
-echo "***** 2.Test redirect origin is file *****"
-mkdir $UPPER_DIR/testdir
-touch $LOWER_DIR/origin
-setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
-if [[ $? -eq 0 ]];then
- echo "ERROR: upper's redirect xattr not remove"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-rm -rf $LOWER_DIR/*
-
-# 3.Test valid redirect xattr
-echo "***** 3.Test valid redirect xattr *****"
-mkdir $UPPER_DIR/testdir
-mknod $UPPER_DIR/origin c 0 0
-mkdir $LOWER_DIR/origin
-setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
-if [[ $? -ne 0 ]];then
- echo "ERROR: upper's redirect xattr incorrect removed"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-rm -rf $LOWER_DIR/*
-
-# 4.Test valid redirect xattr start from root
-echo "***** 4.Test valid redirect xattr start from root *****"
-mkdir -p $UPPER_DIR/testdir0/testdir1
-mknod $UPPER_DIR/origin c 0 0
-mkdir $LOWER_DIR/origin
-setfattr -n $OVL_REDIRECT_XATTR -v "/origin" $UPPER_DIR/testdir0/testdir1
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir0/testdir1
-if [[ $? -ne 0 ]];then
- echo "ERROR: upper's redirect xattr incorrect removed"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-rm -rf $LOWER_DIR/*
-
-# 5.Test missing whiteout in redirect parent directory
-echo "***** 5.Test missing whiteout in redirect parent directory *****"
-mkdir $UPPER_DIR/testdir
-mkdir $LOWER_DIR/origin
-setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
-if [[ $? -ne 0 ]];then
- echo "ERROR: upper's redirect xattr incorrect removed"
- RET=$(($RET+1))
-fi
-if [ ! -e "$UPPER_DIR/origin" ];then
- echo "ERROR: upper's missing whiteout not create"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-rm -rf $UPPER_DIR/*
-
-# 6.Test missing opaque in redirect parent directory
-echo "***** 6.Test missing opaque in redirect parent directory *****"
-mkdir -p $UPPER_DIR/testdir0/testdir1
-mkdir $UPPER_DIR/origin
-mkdir $LOWER_DIR/origin
-setfattr -n $OVL_REDIRECT_XATTR -v "/origin" $UPPER_DIR/testdir0/testdir1
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir0/testdir1
-if [[ $? -ne 0 ]];then
- echo "ERROR: upper's redirect xattr incorrect removed"
- RET=$(($RET+1))
-fi
-getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/origin
-if [[ $? -ne 0 ]];then
- echo "ERROR: upper's missing opaque not set"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-rm -rf $LOWER_DIR/*
-
-# 7.Test duplicate redirect directory in one layer
-echo "***** 7.Test duplicate redirect directory in one layer *****"
-mkdir $UPPER_DIR/testdir0
-mkdir $UPPER_DIR/testdir1
-mknod $UPPER_DIR/origin c 0 0
-mkdir $LOWER_DIR/origin
-setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir0
-setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir1
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-if [[ $? -eq 0 ]];then
- echo "ERROR: fsck check incorrect pass"
- RET=$(($RET+1))
-fi
-rm -rf $UPPER_DIR/*
-rm -rf $LOWER_DIR/*
-
-# 8.Test duplicate redirect directory in different layer
-echo "***** 8.Test duplicate redirect directory in different layer *****"
-mkdir $UPPER_DIR/testdir0
-mkdir $LOWER_DIR/testdir1
-mkdir $LOWER_DIR1/origin
-setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir0
-setfattr -n $OVL_REDIRECT_XATTR -v "origin" $LOWER_DIR/testdir1
-$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
-getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir0
-if [[ $? -ne 0 ]];then
- echo "ERROR: upper's redirect xattr incorrect removed"
- RET=$(($RET+1))
-fi
-getfattr -n $OVL_REDIRECT_XATTR $LOWER_DIR/testdir1
-if [[ $? -ne 0 ]];then
- echo "ERROR: lower's redirect xattr incorrect removed"
- RET=$(($RET+1))
-fi
-
-if [ ! -e "$LOWER_DIR/origin" ];then
- echo "ERROR: upper's missing whiteout not create"
- RET=$(($RET+1))
-fi
-if [ ! -e "$LOWER_DIR/origin" ];then
- echo "ERROR: lower's missing whiteout not create"
- RET=$(($RET+1))
-fi
-
-rm -rf $UPPER_DIR/*
-rm -rf $LOWER_DIR/*
-rm -rf $LOWER_DIR1/*
-
-__clean
-
-exit $RET
diff --git a/test/src/whiteout_test.sh b/test/src/whiteout_test.sh
deleted file mode 100755
index c0e1555..0000000
--- a/test/src/whiteout_test.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. ./local.config
-
-__clean()
-{
- rm -rf $TEST_DIR/*
- cd $PWD
-}
-
-RET=0
-
-cd $TEST_DIR
-rm -rf *
-mkdir $LOWER_DIR $LOWER_DIR1 $UPPER_DIR $WORK_DIR
-
-# 1.Test lower orphan whiteout
-echo "***** 1.Test lower orphan whiteout *****"
-mknod $LOWER_DIR/foo c 0 0
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-if [ -e "$LOWER_DIR/foo" ];then
- echo "lower's whiteout not remove"
- RET=$(($RET+1))
-fi
-rm -f $LOWER_DIR/*
-
-# 2.Test upper orphan whiteout
-echo "***** 2.Test upper orphan whiteout *****"
-mknod $UPPER_DIR/foo c 0 0
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-if [ -e "$UPPER_DIR/foo" ];then
- echo "upper's whiteout not remove"
- RET=$(($RET+1))
-fi
-rm -f $UPPER_DIR/*
-
-# 3.Test upper inuse whiteout
-echo "***** 3.Test upper inuse whiteout *****"
-touch $LOWER_DIR/foo
-mknod $UPPER_DIR/foo c 0 0
-$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-if [ ! -e "$UPPER_DIR/foo" ];then
- echo "upper's whiteout incorrect remove"
- RET=$(($RET+1))
-fi
-rm -f $UPPER_DIR/*
-rm -f $LOWER_DIR/*
-
-# 4.Test lower inuse whiteout
-echo "***** 4.Test lower inuse whiteout *****"
-touch $LOWER_DIR/foo
-mknod $LOWER_DIR1/foo c 0 0
-$OVL_FSCK -a -l $LOWER_DIR1:$LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
-if [ ! -e "$LOWER_DIR1/foo" ];then
- echo "lower's whiteout incorrect remove"
- RET=$(($RET+1))
-fi
-rm -f $LOWER_DIR1/*
-rm -f $LOWER_DIR/*
-
-__clean
-
-exit $RET
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* Re: [PATCH v2 16/18] fsck.overlay: remove test cases
2017-12-14 6:47 ` [PATCH v2 16/18] fsck.overlay: remove test cases zhangyi (F)
@ 2017-12-14 9:11 ` Amir Goldstein
0 siblings, 0 replies; 47+ messages in thread
From: Amir Goldstein @ 2017-12-14 9:11 UTC (permalink / raw)
To: zhangyi (F)
Cc: overlayfs, fstests, Miklos Szeredi, Eryu Guan, Darrick J. Wong, Miao Xie
On Thu, Dec 14, 2017 at 8:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
> Remove test cases for fsck.overlay, these cases will move to xfstests.
Again, better keep you initial incubator version clean of this remove and
not add the tests in the original commit.
>
> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
> ---
> test/README.md | 12 ----
> test/auto_test.sh | 46 -------------
> test/clean.sh | 6 --
> test/local.config | 16 -----
> test/src/opaque_test.sh | 144 ----------------------------------------
> test/src/prepare.sh | 15 -----
> test/src/redirect_test.sh | 163 ----------------------------------------------
> test/src/whiteout_test.sh | 63 ------------------
> 8 files changed, 465 deletions(-)
> delete mode 100644 test/README.md
> delete mode 100755 test/auto_test.sh
> delete mode 100755 test/clean.sh
> delete mode 100644 test/local.config
> delete mode 100755 test/src/opaque_test.sh
> delete mode 100755 test/src/prepare.sh
> delete mode 100755 test/src/redirect_test.sh
> delete mode 100755 test/src/whiteout_test.sh
>
> diff --git a/test/README.md b/test/README.md
> deleted file mode 100644
> index 71dbad8..0000000
> --- a/test/README.md
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -fsck.overlay test
> -=================
> -
> -This test cases simulate different inconsistency of overlay filesystem
> -underlying directories, test fsck.overlay can repair them correctly or not.
> -
> -USAGE
> -=====
> -
> -1. Check "local.config", modify config value to appropriate one.
> -2. ./auto_test.sh
> -3. After testing, the result file and log file created in the result directory.
> diff --git a/test/auto_test.sh b/test/auto_test.sh
> deleted file mode 100755
> index 8248e24..0000000
> --- a/test/auto_test.sh
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -#!/bin/bash
> -
> -. ./src/prepare.sh
> -
> -echo "***************"
> -
> -# 1. Test whiteout
> -echo -e "1.Test Whiteout\n"
> -$SOURCE_DIR/whiteout_test.sh >> $LOG_FILE 2>&1
> -if [ $? -ne 0 ]; then
> - echo -e "Result:\033[31m Fail\033[0m\n"
> - RESULT="Fail"
> -else
> - echo -e "Result:\033[32m Pass\033[0m\n"
> - RESULT="Pass"
> -fi
> -
> -echo -e "Test whiteout: $RESULT" >> $RESOULT_FILE
> -
> -# 2. Test opaque dir
> -echo -e "2.Test opaque directory\n"
> -$SOURCE_DIR/opaque_test.sh >> $LOG_FILE 2>&1
> -if [ $? -ne 0 ]; then
> - echo -e "Result:\033[31m Fail\033[0m\n"
> - RESULT="Fail"
> -else
> - echo -e "Result:\033[32m Pass\033[0m\n"
> - RESULT="Pass"
> -fi
> -
> -echo -e "Test opaque directory: $RESULT" >> $RESOULT_FILE
> -
> -# 3. Test redirect dir
> -echo -e "3.Test redirect direcotry\n"
> -$SOURCE_DIR/redirect_test.sh >> $LOG_FILE 2>&1
> -if [ $? -ne 0 ]; then
> - echo -e "Result:\033[31m Fail\033[0m\n"
> - RESULT="Fail"
> -else
> - echo -e "Result:\033[32m Pass\033[0m\n"
> - RESULT="Pass"
> -fi
> -
> -echo -e "Test redirect direcotry: $RESULT" >> $RESOULT_FILE
> -
> -echo "***************"
> diff --git a/test/clean.sh b/test/clean.sh
> deleted file mode 100755
> index 80f360b..0000000
> --- a/test/clean.sh
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#!/bin/bash
> -
> -. ./src/prepare.sh
> -
> -rm -rf $RESULT_DIR
> -rm -rf $TEST_DIR
> diff --git a/test/local.config b/test/local.config
> deleted file mode 100644
> index 21b25c2..0000000
> --- a/test/local.config
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -# Config
> -export OVL_FSCK=fsck.overlay
> -export TEST_DIR=/mnt/test
> -
> -# Base environment
> -export PWD=`pwd`
> -export RESULT_DIR=$PWD/result
> -export SOURCE_DIR=$PWD/src
> -
> -# Overlayfs config
> -export LOWER_DIR="lower"
> -export UPPER_DIR="upper"
> -export WORK_DIR="work"
> -export MERGE_DIR="merge"
> -export LOWER_DIR1="lower1"
> -export WORK_DIR1="work1"
> diff --git a/test/src/opaque_test.sh b/test/src/opaque_test.sh
> deleted file mode 100755
> index 7cb5030..0000000
> --- a/test/src/opaque_test.sh
> +++ /dev/null
> @@ -1,144 +0,0 @@
> -#!/bin/bash
> -
> -. ./local.config
> -
> -__clean()
> -{
> - rm -rf $TEST_DIR/*
> - cd $PWD
> -}
> -
> -OVL_OPAQUE_XATTR="trusted.overlay.opaque"
> -OVL_OPAQUE_XATTR_VAL="y"
> -RET=0
> -
> -cd $TEST_DIR
> -rm -rf *
> -mkdir $LOWER_DIR $LOWER_DIR1 $UPPER_DIR $WORK_DIR
> -
> -# 1.Test lower invalid opaque directory
> -echo "***** 1.Test lower invalid opaque directory *****"
> -mkdir $LOWER_DIR/testdir
> -setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir
> -if [[ $? -eq 0 ]];then
> - echo "ERROR: lower's invalid opaque xattr not remove"
> - RET=$(($RET+1))
> -fi
> -rm -rf $LOWER_DIR/*
> -
> -# 2.Test upper invalid opaque directory
> -echo "***** 2.Test upper invalid opaque directory *****"
> -mkdir -p $UPPER_DIR/testdir0/testdir1
> -setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir0/testdir1
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir0/testdir1
> -if [[ $? -eq 0 ]];then
> - echo "ERROR: upper's invalid opaque xattr not remove"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -
> -# 3.Test upper opaque direcotry in merged directory
> -echo "***** 3.Test upper opaque direcotry in merged directory *****"
> -mkdir $UPPER_DIR/testdir
> -setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: upper's opaque xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -
> -# 4.Test upper opaque direcotry cover lower file
> -echo "***** 4.Test upper opaque direcotry cover lower file *****"
> -mkdir $UPPER_DIR/testdir
> -mkdir $LOWER_DIR/testdir
> -setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: upper's opaque xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -rm -rf $LOWER_DIR/*
> -
> -# 5.Test upper opaque direcotry cover lower directory
> -echo "***** 5.Test upper opaque direcotry cover lower directory *****"
> -mkdir $UPPER_DIR/testdir
> -touch $LOWER_DIR/testdir
> -setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: upper's opaque xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -rm -rf $LOWER_DIR/*
> -
> -# 6.Test lower invalid opaque directory in middle layer
> -echo "***** 6.Test lower invalid opaque directory in middle layer *****"
> -mkdir $LOWER_DIR/testdir0/testdir1
> -setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir0/testdir1
> -$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir0/testdir1
> -if [[ $? -eq 0 ]];then
> - echo "ERROR: middle's opaque xattr not removed"
> - RET=$(($RET+1))
> -fi
> -rm -rf $LOWER_DIR/*
> -
> -# 7.Test lower invalid opaque directory in bottom layer
> -echo "***** 7.Test lower invalid opaque directory in bottom layer *****"
> -mkdir $LOWER_DIR1/testdir0/testdir1
> -setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR1/testdir0/
> -$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR1/testdir0/testdir1
> -if [[ $? -eq 0 ]];then
> - echo "ERROR: middle's opaque xattr not removed"
> - RET=$(($RET+1))
> -fi
> -rm -rf $LOWER_DIR1/*
> -
> -# 8.Test middle opaque direcotry cover bottom directory
> -echo "***** 8.Test middle opaque direcotry cover bottom directory *****"
> -mkdir $LOWER_DIR1/testdir
> -mkdir $LOWER_DIR/testdir
> -setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir
> -$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: middle's opaque xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -rm -rf $LOWER_DIR1/*
> -rm -rf $LOWER_DIR/*
> -
> -# 9.Test double opaque direcotry in middle and upper layer
> -echo "***** 9.Test double opaque direcotry in middle and upper layer *****"
> -mkdir $LOWER_DIR1/testdir
> -mkdir $LOWER_DIR/testdir
> -mkdir $UPPER_DIR/testdir
> -setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $LOWER_DIR/testdir
> -setfattr -n $OVL_OPAQUE_XATTR -v $OVL_OPAQUE_XATTR_VAL $UPPER_DIR/testdir
> -$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_OPAQUE_XATTR $LOWER_DIR/testdir
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: middle's opaque xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/testdir
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: upper's opaque xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -rm -rf $LOWER_DIR1/*
> -rm -rf $LOWER_DIR/*
> -rm -rf $UPPER_DIR/*
> -
> -__clean
> -exit $RET
> diff --git a/test/src/prepare.sh b/test/src/prepare.sh
> deleted file mode 100755
> index 138539a..0000000
> --- a/test/src/prepare.sh
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -#!/bin/bash
> -
> -. ./local.config
> -
> -NOW=`date +"%Y-%m-%d-%H-%M-%S"`
> -LOG_FILE=$RESULT_DIR/LOG_${NOW}.log
> -RESOULT_FILE=$RESULT_DIR/RESULT_${NOW}.out
> -
> -# creat test base dir
> -if [ ! -d "$TEST_DIR" ]; then
> - mkdir -p $TEST_DIR
> -fi
> -
> -# creat result dir
> -mkdir -p $RESULT_DIR
> diff --git a/test/src/redirect_test.sh b/test/src/redirect_test.sh
> deleted file mode 100755
> index be2ce80..0000000
> --- a/test/src/redirect_test.sh
> +++ /dev/null
> @@ -1,163 +0,0 @@
> -#!/bin/bash
> -
> -. ./local.config
> -
> -__clean()
> -{
> - rm -rf $TEST_DIR/*
> - cd $PWD
> -}
> -
> -OVL_REDIRECT_XATTR="trusted.overlay.redirect"
> -OVL_OPAQUE_XATTR="trusted.overlay.opaque"
> -RET=0
> -
> -cd $TEST_DIR
> -rm -rf *
> -mkdir $LOWER_DIR $LOWER_DIR1 $UPPER_DIR $WORK_DIR
> -
> -# 1.Test no exist redirect origin
> -echo "***** 1.Test no exist redirect origin *****"
> -mkdir $UPPER_DIR/testdir
> -setfattr -n $OVL_REDIRECT_XATTR -v "xxx" $UPPER_DIR/testdir
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
> -if [[ $? -eq 0 ]];then
> - echo "ERROR: upper's redirect xattr not remove"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -
> -# 2.Test redirect origin is file
> -echo "***** 2.Test redirect origin is file *****"
> -mkdir $UPPER_DIR/testdir
> -touch $LOWER_DIR/origin
> -setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
> -if [[ $? -eq 0 ]];then
> - echo "ERROR: upper's redirect xattr not remove"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -rm -rf $LOWER_DIR/*
> -
> -# 3.Test valid redirect xattr
> -echo "***** 3.Test valid redirect xattr *****"
> -mkdir $UPPER_DIR/testdir
> -mknod $UPPER_DIR/origin c 0 0
> -mkdir $LOWER_DIR/origin
> -setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: upper's redirect xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -rm -rf $LOWER_DIR/*
> -
> -# 4.Test valid redirect xattr start from root
> -echo "***** 4.Test valid redirect xattr start from root *****"
> -mkdir -p $UPPER_DIR/testdir0/testdir1
> -mknod $UPPER_DIR/origin c 0 0
> -mkdir $LOWER_DIR/origin
> -setfattr -n $OVL_REDIRECT_XATTR -v "/origin" $UPPER_DIR/testdir0/testdir1
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir0/testdir1
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: upper's redirect xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -rm -rf $LOWER_DIR/*
> -
> -# 5.Test missing whiteout in redirect parent directory
> -echo "***** 5.Test missing whiteout in redirect parent directory *****"
> -mkdir $UPPER_DIR/testdir
> -mkdir $LOWER_DIR/origin
> -setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: upper's redirect xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -if [ ! -e "$UPPER_DIR/origin" ];then
> - echo "ERROR: upper's missing whiteout not create"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -rm -rf $UPPER_DIR/*
> -
> -# 6.Test missing opaque in redirect parent directory
> -echo "***** 6.Test missing opaque in redirect parent directory *****"
> -mkdir -p $UPPER_DIR/testdir0/testdir1
> -mkdir $UPPER_DIR/origin
> -mkdir $LOWER_DIR/origin
> -setfattr -n $OVL_REDIRECT_XATTR -v "/origin" $UPPER_DIR/testdir0/testdir1
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir0/testdir1
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: upper's redirect xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -getfattr -n $OVL_OPAQUE_XATTR $UPPER_DIR/origin
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: upper's missing opaque not set"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -rm -rf $LOWER_DIR/*
> -
> -# 7.Test duplicate redirect directory in one layer
> -echo "***** 7.Test duplicate redirect directory in one layer *****"
> -mkdir $UPPER_DIR/testdir0
> -mkdir $UPPER_DIR/testdir1
> -mknod $UPPER_DIR/origin c 0 0
> -mkdir $LOWER_DIR/origin
> -setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir0
> -setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir1
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -if [[ $? -eq 0 ]];then
> - echo "ERROR: fsck check incorrect pass"
> - RET=$(($RET+1))
> -fi
> -rm -rf $UPPER_DIR/*
> -rm -rf $LOWER_DIR/*
> -
> -# 8.Test duplicate redirect directory in different layer
> -echo "***** 8.Test duplicate redirect directory in different layer *****"
> -mkdir $UPPER_DIR/testdir0
> -mkdir $LOWER_DIR/testdir1
> -mkdir $LOWER_DIR1/origin
> -setfattr -n $OVL_REDIRECT_XATTR -v "origin" $UPPER_DIR/testdir0
> -setfattr -n $OVL_REDIRECT_XATTR -v "origin" $LOWER_DIR/testdir1
> -$OVL_FSCK -a -l $LOWER_DIR:$LOWER_DIR1 -u $UPPER_DIR -w $WORK_DIR
> -getfattr -n $OVL_REDIRECT_XATTR $UPPER_DIR/testdir0
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: upper's redirect xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -getfattr -n $OVL_REDIRECT_XATTR $LOWER_DIR/testdir1
> -if [[ $? -ne 0 ]];then
> - echo "ERROR: lower's redirect xattr incorrect removed"
> - RET=$(($RET+1))
> -fi
> -
> -if [ ! -e "$LOWER_DIR/origin" ];then
> - echo "ERROR: upper's missing whiteout not create"
> - RET=$(($RET+1))
> -fi
> -if [ ! -e "$LOWER_DIR/origin" ];then
> - echo "ERROR: lower's missing whiteout not create"
> - RET=$(($RET+1))
> -fi
> -
> -rm -rf $UPPER_DIR/*
> -rm -rf $LOWER_DIR/*
> -rm -rf $LOWER_DIR1/*
> -
> -__clean
> -
> -exit $RET
> diff --git a/test/src/whiteout_test.sh b/test/src/whiteout_test.sh
> deleted file mode 100755
> index c0e1555..0000000
> --- a/test/src/whiteout_test.sh
> +++ /dev/null
> @@ -1,63 +0,0 @@
> -#!/bin/bash
> -
> -. ./local.config
> -
> -__clean()
> -{
> - rm -rf $TEST_DIR/*
> - cd $PWD
> -}
> -
> -RET=0
> -
> -cd $TEST_DIR
> -rm -rf *
> -mkdir $LOWER_DIR $LOWER_DIR1 $UPPER_DIR $WORK_DIR
> -
> -# 1.Test lower orphan whiteout
> -echo "***** 1.Test lower orphan whiteout *****"
> -mknod $LOWER_DIR/foo c 0 0
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -if [ -e "$LOWER_DIR/foo" ];then
> - echo "lower's whiteout not remove"
> - RET=$(($RET+1))
> -fi
> -rm -f $LOWER_DIR/*
> -
> -# 2.Test upper orphan whiteout
> -echo "***** 2.Test upper orphan whiteout *****"
> -mknod $UPPER_DIR/foo c 0 0
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -if [ -e "$UPPER_DIR/foo" ];then
> - echo "upper's whiteout not remove"
> - RET=$(($RET+1))
> -fi
> -rm -f $UPPER_DIR/*
> -
> -# 3.Test upper inuse whiteout
> -echo "***** 3.Test upper inuse whiteout *****"
> -touch $LOWER_DIR/foo
> -mknod $UPPER_DIR/foo c 0 0
> -$OVL_FSCK -a -l $LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -if [ ! -e "$UPPER_DIR/foo" ];then
> - echo "upper's whiteout incorrect remove"
> - RET=$(($RET+1))
> -fi
> -rm -f $UPPER_DIR/*
> -rm -f $LOWER_DIR/*
> -
> -# 4.Test lower inuse whiteout
> -echo "***** 4.Test lower inuse whiteout *****"
> -touch $LOWER_DIR/foo
> -mknod $LOWER_DIR1/foo c 0 0
> -$OVL_FSCK -a -l $LOWER_DIR1:$LOWER_DIR -u $UPPER_DIR -w $WORK_DIR
> -if [ ! -e "$LOWER_DIR1/foo" ];then
> - echo "lower's whiteout incorrect remove"
> - RET=$(($RET+1))
> -fi
> -rm -f $LOWER_DIR1/*
> -rm -f $LOWER_DIR/*
> -
> -__clean
> -
> -exit $RET
> --
> 2.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 47+ messages in thread
* [PATCH v2 17/18] fsck.overlay: not enforce overlayfs is offline in 'no changes' mode
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (15 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 16/18] fsck.overlay: remove test cases zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 6:47 ` [PATCH v2 18/18] fsck.overlay: use relative path when checking lowers zhangyi (F)
2017-12-14 9:27 ` [PATCH v2 00/18] overlay: implement fsck.overlay utility Amir Goldstein
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
fsck.c | 4 ++--
mount.c | 14 ++++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/fsck.c b/fsck.c
index 56a5286..d7321fb 100644
--- a/fsck.c
+++ b/fsck.c
@@ -260,7 +260,7 @@ void fsck_status_check(int *val)
int main(int argc, char *argv[])
{
- bool mounted;
+ bool mounted = false;
int err = 0;
int exit_value = 0;
@@ -271,7 +271,7 @@ int main(int argc, char *argv[])
/* Ensure overlay filesystem not mounted */
if ((err = ovl_check_mount(&mounted)))
goto out;
- if (!mounted) {
+ if (mounted && !(flags & FL_OPT_NO)) {
set_st_abort(&status);
goto out;
}
diff --git a/mount.c b/mount.c
index 10970d5..a4bf492 100644
--- a/mount.c
+++ b/mount.c
@@ -280,12 +280,11 @@ static void ovl_scan_mount_exit(struct ovl_mnt_entry *ovl_mnt_entries,
* Note: fsck may modify lower layers, so even match only one directory
* is triggered as mounted.
*/
-int ovl_check_mount(bool *pass)
+int ovl_check_mount(bool *mounted)
{
struct ovl_mnt_entry *ovl_mnt_entries = NULL;
int ovl_mnt_entry_count = 0;
char *mounted_path = NULL;
- bool mounted = false;
int i,j,k;
int ret;
@@ -301,7 +300,7 @@ int ovl_check_mount(bool *pass)
if (!strcmp(lowerdir[k],
ovl_mnt_entries[i].lowerdir[j])) {
mounted_path = lowerdir[k];
- mounted = true;
+ *mounted = true;
goto out;
}
}
@@ -310,23 +309,22 @@ int ovl_check_mount(bool *pass)
/* Check upper */
if (!(strcmp(upperdir, ovl_mnt_entries[i].upperdir))) {
mounted_path = upperdir;
- mounted = true;
+ *mounted = true;
goto out;
}
/* Check worker */
if (workdir[0] != '\0' && !(strcmp(workdir, ovl_mnt_entries[i].workdir))) {
mounted_path = workdir;
- mounted = true;
+ *mounted = true;
goto out;
}
}
out:
ovl_scan_mount_exit(ovl_mnt_entries, ovl_mnt_entry_count);
- if (mounted)
- print_info(_("Dir %s is mounted\n"), mounted_path);
- *pass = !mounted;
+ if (*mounted)
+ print_info(_("WARNING: Dir %s is mounted\n"), mounted_path);
return 0;
}
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* [PATCH v2 18/18] fsck.overlay: use relative path when checking lowers
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (16 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 17/18] fsck.overlay: not enforce overlayfs is offline in 'no changes' mode zhangyi (F)
@ 2017-12-14 6:47 ` zhangyi (F)
2017-12-14 9:27 ` [PATCH v2 00/18] overlay: implement fsck.overlay utility Amir Goldstein
18 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 6:47 UTC (permalink / raw)
To: linux-unionfs, fstests
Cc: miklos, amir73il, eguan, darrick.wong, yi.zhang, miaoxie
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
README.md | 56 +++++++++++++++++++++++++++++++++-----------------------
1 file changed, 33 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index 8de69cd..1d759b0 100644
--- a/README.md
+++ b/README.md
@@ -20,11 +20,12 @@ Opaque directories
------------------
An opaque directory is a directory with "trusted.overlay.opaque" xattr valued
-"y". There are two legal situations of making opaque directory: 1) create
-directory over whiteout 2) creat directory in merged directory. If an opaque
-directory is found, corresponding matching name in lower layers might exist or
-parent directory might merged, If not, the opaque xattr will be treated as
-invalid and remove.
+"y". There are two legal situations of making opaque directory:
+1) Create directory over whiteout,
+2) Creat directory in merged directory.
+If an opaque directory is found, either corresponding matching name in lower
+layers is exist or parent directory is merged, If not, the opaque xattr will be
+treated as invalid and remove.
Redirect directories
@@ -35,17 +36,21 @@ valued to the path of the original location from the root of the overlay. It
is only used when renaming a directory and "redirect dir" feature is enabled.
If an redirect directory is found, the following must be met:
-1) The directory store in redirect xattr should exist in one of lower layers.
+1) The directory path pointed by redirect xattr should exist in one of lower
+ layers.
2) The origin directory should be redirected only once in one layer, which mean
there is only one redirect xattr point to this origin directory in the
specified layer.
-3) A whiteout or an opaque directory with the same name to origin should exist
- in the same directory as the redirect directory.
+3) A whiteout or an opaque directory or another redirect directory with the
+ same name to origin should exist in the same directory as the redirect
+ directory.
If not, 1) The redirect xattr is invalid and need to remove 2) One of the
-redirect xattr is redundant but not sure which one is, ask user 3) Create a
-whiteout device or set opaque xattr to an existing directory if the parent
-directory was meregd or remove xattr if not.
+redirect xattr is redundant but not sure which one is, ask user by default or
+remove in 'yes' mode 3) Check and fix the missing whiteout or opaque in redierct
+parent directory if there is no another redirected upper directory covering the
+redirect lower target.
+
Usage
=====
@@ -58,14 +63,17 @@ Usage
fsck.overlay [-l lowerdir] [-u upperdir] [-w workdir] [-avhV]
Options:
- -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
- multiple lower use ':' as separator.
- -u, --upperdir=UPPERDIR specify upper directory of overlayfs
- -w, --workdir=WORKDIR specify work directory of overlayfs
- -a, --auto repair automatically (no questions)
- -v, --verbose print more messages of overlayfs
- -h, --help display this usage of overlayfs
- -V, --version display version information
+ -l, --lowerdir=LOWERDIR specify lower directories of overlayfs,
+ multiple lower use ':' as separator,
+ the leftmost one is the toppest
+ -u, --upperdir=UPPERDIR specify upper directory of overlayfs
+ -w, --workdir=WORKDIR specify work directory of overlayfs
+ -p, automatic repair (no questions)
+ -n, make no changes to the filesystem
+ -y, assume "yes" to all questions
+ -v, --verbose print more messages of overlayfs
+ -h, --help display this usage of overlayfs
+ -V, --version display version information
3. Exit value:
0 No errors
@@ -82,7 +90,9 @@ Todo
1. Overlay filesystem mounted check. Prevent fscking when overlay is
online. Now, We cannot distinguish mounted directories if overlayfs was
- mounted with relative path.
-2. Symbolic link check.
-3. Check origin/impure/nlink xattr.
-4. ...
+ mounted with relative path. Should modify kernel together to support.
+2. Check and fix invalid redirect xattr through origin xattr.
+3. Symbolic link check.
+4. Check origin/impure/nlink xattr.
+5. Check index feature consistency.
+6. ...
--
2.9.5
^ permalink raw reply related [flat|nested] 47+ messages in thread* Re: [PATCH v2 00/18] overlay: implement fsck.overlay utility
2017-12-14 6:47 [PATCH v2 00/18] overlay: implement fsck.overlay utility zhangyi (F)
` (17 preceding siblings ...)
2017-12-14 6:47 ` [PATCH v2 18/18] fsck.overlay: use relative path when checking lowers zhangyi (F)
@ 2017-12-14 9:27 ` Amir Goldstein
2017-12-14 10:43 ` zhangyi (F)
18 siblings, 1 reply; 47+ messages in thread
From: Amir Goldstein @ 2017-12-14 9:27 UTC (permalink / raw)
To: zhangyi (F)
Cc: overlayfs, fstests, Miklos Szeredi, Eryu Guan, Darrick J. Wong, Miao Xie
On Thu, Dec 14, 2017 at 8:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
> Hi all,
>
> Here is the second version of original fsck.overlay. Changes split to
> each patch from first version "overlay: implement fsck utility" for
> readability.
It fine that you left original commit for readability and ease of re-review
I don't mind that functional review comments, (like -n, -p -a) are
addressed by an incremental commit, but there are too many patches
that fix spelling mistakes and build warnings.
Please squash those fix patches into the relevant commit instead of
posting them for review.
I will review the entire series when is it re posted as a clean series.
>
> I have already handled most of comments from the first iteration and
> add/fix some infrastructure, no big features, move tests to xfstests
> (already tested).
>
> I will push this "incubator" version to github after review and fix.
> Any comments is helpful, thanks!
>
> Changes since v1:
>
> - Add "-n -p -y" options. (Comment from Amir and Darrick)
> - Move test cases to xfstests. (Amir, Eryu and Ted)
> - * Check lowers use base fd + relative path to speed up iterations. (Amir)
> - Handle missing case of redirect xattr check. (Amir)
> - Correct copyright and License. (Amir)
> - Remove duplicate redirect xattr in 'yes' mode.
> - Add objects counter.
> - Not enforce fs offline in 'no' mode.
> - Fix some code mistakes.
>
> *) This change will cost a lot of 'fd' (up to 500) and will not work
> if sysctl_nr_open is lower than lowerdir number (special case, default
> is 1024*1024). I think expand sysctl_nr_open temporary may have some side
> effect, so just return failure.
>
I don't think I follow.
Perhaps you misunderstood me or I don't remember what I commented on.
What I meant was that you can keep fd of lowerdirs,upperdir,workdir and
use those as dir_fd for various syscalls that require overlay relative path,
instead of composing the upper/lower paths as strings.
How did we get to 500 fds?
Amir.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 00/18] overlay: implement fsck.overlay utility
2017-12-14 9:27 ` [PATCH v2 00/18] overlay: implement fsck.overlay utility Amir Goldstein
@ 2017-12-14 10:43 ` zhangyi (F)
0 siblings, 0 replies; 47+ messages in thread
From: zhangyi (F) @ 2017-12-14 10:43 UTC (permalink / raw)
To: Amir Goldstein
Cc: overlayfs, fstests, Miklos Szeredi, Eryu Guan, Darrick J. Wong, Miao Xie
On 2017/12/14 17:27, Amir Goldstein Wrote:
> On Thu, Dec 14, 2017 at 8:47 AM, zhangyi (F) <yi.zhang@huawei.com> wrote:
>> Hi all,
>>
>> Here is the second version of original fsck.overlay. Changes split to
>> each patch from first version "overlay: implement fsck utility" for
>> readability.
>
> It fine that you left original commit for readability and ease of re-review
> I don't mind that functional review comments, (like -n, -p -a) are
> addressed by an incremental commit, but there are too many patches
> that fix spelling mistakes and build warnings.
> Please squash those fix patches into the relevant commit instead of
> posting them for review.
>
> I will review the entire series when is it re posted as a clean series.
>
Oh, sorry about that, I will squash patches and repost it again,
please skip these version, thanks!
>>
>> I have already handled most of comments from the first iteration and
>> add/fix some infrastructure, no big features, move tests to xfstests
>> (already tested).
>>
>> I will push this "incubator" version to github after review and fix.
>> Any comments is helpful, thanks!
>>
>> Changes since v1:
>>
>> - Add "-n -p -y" options. (Comment from Amir and Darrick)
>> - Move test cases to xfstests. (Amir, Eryu and Ted)
>> - * Check lowers use base fd + relative path to speed up iterations. (Amir)
>> - Handle missing case of redirect xattr check. (Amir)
>> - Correct copyright and License. (Amir)
>> - Remove duplicate redirect xattr in 'yes' mode.
>> - Add objects counter.
>> - Not enforce fs offline in 'no' mode.
>> - Fix some code mistakes.
>>
>> *) This change will cost a lot of 'fd' (up to 500) and will not work
>> if sysctl_nr_open is lower than lowerdir number (special case, default
>> is 1024*1024). I think expand sysctl_nr_open temporary may have some side
>> effect, so just return failure.
>>
>
> I don't think I follow.
> Perhaps you misunderstood me or I don't remember what I commented on.
> What I meant was that you can keep fd of lowerdirs,upperdir,workdir and
> use those as dir_fd for various syscalls that require overlay relative path,
> instead of composing the upper/lower paths as strings.
> How did we get to 500 fds?
>
Yes, I keep fd of lowerdirs now, and I notice that if user specify mutli-lowers
up to 500(the upper limit), we have to keep all these fds when checking lower dirs
to find an existing target, like this:
for (i = start; i < lower_num; i++) {
if (fstatat(lowerfd[i], pathname, &st,
AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW) != 0)
...
So I am worry about the problem of sysctl_nr_open is lower than lower_num here.
Thanks,
Yi.
^ permalink raw reply [flat|nested] 47+ messages in thread