All of lore.kernel.org
 help / color / mirror / Atom feed
From: "zhangyi (F)" <yi.zhang@huawei.com>
To: linux-unionfs@vger.kernel.org, fstests@vger.kernel.org
Cc: miklos@szeredi.hu, amir73il@gmail.com, eguan@redhat.com,
	darrick.wong@oracle.com, yi.zhang@huawei.com, miaoxie@huawei.com
Subject: [PATCH v2 08/18] fsck.overlay: fix spelling mistakes
Date: Thu, 14 Dec 2017 14:47:37 +0800	[thread overview]
Message-ID: <20171214064747.20999-9-yi.zhang@huawei.com> (raw)
In-Reply-To: <20171214064747.20999-1-yi.zhang@huawei.com>

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

  parent reply	other threads:[~2017-12-14  6:47 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 14:13   ` Miklos Szeredi
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:10           ` Miklos Szeredi
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
2017-12-15 14:18                   ` Miklos Szeredi
2017-12-15 14:44                     ` Amir Goldstein
2017-12-15 16:06                       ` Miklos Szeredi
2017-12-15 16:14                         ` Miklos Szeredi
2017-12-15 15:16                     ` Vivek Goyal
2017-12-15 16:17                       ` Miklos Szeredi
2017-12-14 15:21       ` Vivek Goyal
2017-12-14 15:43         ` Amir Goldstein
2017-12-14 16:12           ` Vivek Goyal
2017-12-15  4:18       ` zhangyi (F)
2017-12-15  3:35     ` zhangyi (F)
2017-12-15  7:45       ` Amir Goldstein
2017-12-15  9:13         ` zhangyi (F)
2017-12-14  6:47 ` [PATCH v2 02/18] fsck.overlay: fix uninitialized variable 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)
2017-12-14  6:47 ` [PATCH v2 04/18] fsck.overlay: add path package and split helper zhangyi (F)
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 ` [PATCH v2 06/18] fsck.overlay: open lowerdirs in advance zhangyi (F)
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) [this message]
2017-12-14  9:13   ` [PATCH v2 08/18] fsck.overlay: fix spelling mistakes Amir Goldstein
2017-12-14  6:47 ` [PATCH v2 09/18] fsck.overlay: add counter of checked objects zhangyi (F)
2017-12-14  6:47 ` [PATCH v2 10/18] fsck.overlay: fix verbose flag zhangyi (F)
2017-12-14  6:47 ` [PATCH v2 11/18] fsck.overlay: add ovl_ask_invalid helper zhangyi (F)
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 ` [PATCH v2 13/18] fsck.overlay: handle missing case of redirecte directory zhangyi (F)
2017-12-14  6:47 ` [PATCH v2 14/18] fsck.overlay: correct copyright and License 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)
2017-12-14  6:47 ` [PATCH v2 16/18] fsck.overlay: remove test cases 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)
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
2017-12-14 10:43   ` zhangyi (F)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171214064747.20999-9-yi.zhang@huawei.com \
    --to=yi.zhang@huawei.com \
    --cc=amir73il@gmail.com \
    --cc=darrick.wong@oracle.com \
    --cc=eguan@redhat.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-unionfs@vger.kernel.org \
    --cc=miaoxie@huawei.com \
    --cc=miklos@szeredi.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.