linux-raid.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nigel Croxon <ncroxon@redhat.com>
To: jes@trained-monkey.org, linux-raid@vger.kernel.org
Subject: [PATCH V2] allow RAID5 to grow to RAID6 with a backup_file
Date: Tue,  5 May 2020 14:35:45 -0400	[thread overview]
Message-ID: <20200505183545.26291-1-ncroxon@redhat.com> (raw)

This problem came in, as the user did not specify a full path with
the backup_file option when growing an RAID5 array to RAID6.
When the full path is specified, the symbolic link is created
properly (/run/mdadm/backup_file-mdX). But the code did not support
the symbolic link when looking for the backup_file. Added two
checks for symlink.

This addresses https://www.spinics.net/lists/raid/msg48910.html
and numerous customer reported problems.

V2:
- Removed unneeded break; in both case-statements
- Returned the error checking on call to lstat

Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
---
 Grow.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/Grow.c b/Grow.c
index 764374f..53245d7 100644
--- a/Grow.c
+++ b/Grow.c
@@ -1135,6 +1135,15 @@ int reshape_open_backup_file(char *backup_file,
 	unsigned int dev;
 	int i;
 
+	if (lstat(backup_file, &stb) != -1) {
+		switch (stb.st_mode & S_IFMT) {
+		case S_IFLNK:
+			return 1;
+		default:
+			break;
+		}
+	}
+
 	*fdlist = open(backup_file, O_RDWR|O_CREAT|(restart ? O_TRUNC : O_EXCL),
 		       S_IRUSR | S_IWUSR);
 	*offsets = 8 * 512;
@@ -5236,8 +5245,16 @@ char *locate_backup(char *name)
 	char *fl = make_backup(name);
 	struct stat stb;
 
-	if (stat(fl, &stb) == 0 && S_ISREG(stb.st_mode))
-		return fl;
+	if (lstat(fl, &stb) == 0) {
+		switch (stb.st_mode & S_IFMT) {
+		case S_IFLNK:
+			return fl;
+		case S_IFREG:
+			return fl;
+		default:
+			break;
+		}
+	}
 
 	free(fl);
 	return NULL;
-- 
2.20.1

             reply	other threads:[~2020-05-05 18:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-05 18:35 Nigel Croxon [this message]
2020-05-08 14:01 ` [PATCH V2] allow RAID5 to grow to RAID6 with a backup_file Jes Sorensen
2020-05-08 14:50   ` Nigel Croxon
2020-05-12 16:26     ` Nigel Croxon
2020-05-12 18:50       ` Jes Sorensen

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=20200505183545.26291-1-ncroxon@redhat.com \
    --to=ncroxon@redhat.com \
    --cc=jes@trained-monkey.org \
    --cc=linux-raid@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).