Linux-Raid Archives mirror
 help / color / mirror / Atom feed
From: Kinga Tanska <kinga.tanska@linux.intel.com>
To: Paul Menzel <pmenzel@molgen.mpg.de>
Cc: Kinga Tanska <kinga.tanska@intel.com>,
	linux-raid@vger.kernel.org, jes@trained-monkey.org,
	mariusz.tkaczyk@linux.intel.com
Subject: Re: [PATCH] Detail: remove duplicated code
Date: Tue, 27 Feb 2024 15:44:44 +0100	[thread overview]
Message-ID: <20240227154302.0000798c@intel.linux.com> (raw)
In-Reply-To: <e6a839df-7830-4dff-9271-aa245e2be7ed@molgen.mpg.de>

On Tue, 27 Feb 2024 14:44:59 +0100
Paul Menzel <pmenzel@molgen.mpg.de> wrote:

> Dear Kinga,
> 
> 
> Thank you for your patch.
> 
> Am 27.02.24 um 07:36 schrieb Kinga Tanska:
> > Remove duplicated code from Detail(), where MD_UUID
> > and MD_DEVNAME are being set. Superblock is no longer
> > required to print system properties. Now it tries to
> > obtain map in two ways.  
> 
> Do you have the commit removing the requirement handy? If so, please
> add it.
> 
> It’d be great if you used 72 characters per line, so less lines are
> used.
> 
> 
> Kind regards,
> 
> Paul
> 
> 
> > Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
> > ---
> >   Detail.c | 33 +++++++++++++--------------------
> >   1 file changed, 13 insertions(+), 20 deletions(-)
> > 
> > diff --git a/Detail.c b/Detail.c
> > index 57ac336f..92affdc6 100644
> > --- a/Detail.c
> > +++ b/Detail.c
> > @@ -226,6 +226,9 @@ int Detail(char *dev, struct context *c)
> >   		str = map_num(pers, array.level);
> >   
> >   	if (c->export) {
> > +		char nbuf[64];
> > +		struct map_ent *mp = NULL, *map = NULL;
> > +
> >   		if (array.raid_disks) {
> >   			if (str)
> >   				printf("MD_LEVEL=%s\n", str);
> > @@ -247,32 +250,22 @@ int Detail(char *dev, struct context *c)
> >   				       array.minor_version);
> >   		}
> >   
> > -		if (st && st->sb && info) {
> > -			char nbuf[64];
> > -			struct map_ent *mp, *map = NULL;
> > -
> > -			fname_from_uuid(st, info, nbuf, ':');
> > -			printf("MD_UUID=%s\n", nbuf + 5);
> > +		if (info)
> >   			mp = map_by_uuid(&map, info->uuid);
> > +		if (!mp)
> > +			mp = map_by_devnm(&map, fd2devnm(fd));
> >   
> > -			if (mp && mp->path && strncmp(mp->path,
> > DEV_MD_DIR, DEV_MD_DIR_LEN) == 0)
> > +		if (mp) {
> > +			__fname_from_uuid(mp->uuid, 0, nbuf, ':');
> > +			printf("MD_UUID=%s\n", nbuf + 5);
> > +			if (mp->path && strncmp(mp->path,
> > DEV_MD_DIR, DEV_MD_DIR_LEN) == 0) printf("MD_DEVNAME=%s\n",
> > mp->path + DEV_MD_DIR_LEN);
> > +		}
> >   
> > +		map_free(map);
> > +		if (st && st->sb) {
> >   			if (st->ss->export_detail_super)
> >   				st->ss->export_detail_super(st);
> > -			map_free(map);
> > -		} else {
> > -			struct map_ent *mp, *map = NULL;
> > -			char nbuf[64];
> > -			mp = map_by_devnm(&map, fd2devnm(fd));
> > -			if (mp) {
> > -				__fname_from_uuid(mp->uuid, 0,
> > nbuf, ':');
> > -				printf("MD_UUID=%s\n", nbuf+5);
> > -			}
> > -			if (mp && mp->path && strncmp(mp->path,
> > DEV_MD_DIR, DEV_MD_DIR_LEN) == 0)
> > -				printf("MD_DEVNAME=%s\n", mp->path
> > + DEV_MD_DIR_LEN); -
> > -			map_free(map);
> >   		}
> >   		if (!c->no_devices && sra) {
> >   			struct mdinfo *mdi;  
> 

Hi Paul,

I don't have commit which removes this requirement. This fix is based
on my findings. In previous version superblock was required to find map
by uuid and fill all of the properties. Sometimes map was not found,
which was caused by some time race or custom settings (for example when
using IMSM_DEVNAME_AS_SERIAL flag. That's why I've added another try to
obtain map using devname.
I've already sent v2 with description updated. 

Regards,
Kinga

      reply	other threads:[~2024-02-27 14:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-27  6:36 [PATCH] Detail: remove duplicated code Kinga Tanska
2024-02-27 13:44 ` Paul Menzel
2024-02-27 14:44   ` Kinga Tanska [this message]

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=20240227154302.0000798c@intel.linux.com \
    --to=kinga.tanska@linux.intel.com \
    --cc=jes@trained-monkey.org \
    --cc=kinga.tanska@intel.com \
    --cc=linux-raid@vger.kernel.org \
    --cc=mariusz.tkaczyk@linux.intel.com \
    --cc=pmenzel@molgen.mpg.de \
    /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 read-only IMAP folder(s) and NNTP newsgroup(s).