Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Jun 2012 18:54:42 +0000 (UTC)
From:      Sean Bruno <sbruno@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r236720 - stable/8/sys/dev/mfi
Message-ID:  <201206071854.q57IsgLg005472@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sbruno
Date: Thu Jun  7 18:54:42 2012
New Revision: 236720
URL: http://svn.freebsd.org/changeset/base/236720

Log:
  MFC r236323
  
  Cosmetic nit.  If a configured volume has no label, don't emit an empty
  string for the name during probe.  Simply indicate that it has no label.

Modified:
  stable/8/sys/dev/mfi/mfi_disk.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/dev/mfi/mfi_disk.c
==============================================================================
--- stable/8/sys/dev/mfi/mfi_disk.c	Thu Jun  7 18:44:06 2012	(r236719)
+++ stable/8/sys/dev/mfi/mfi_disk.c	Thu Jun  7 18:54:42 2012	(r236720)
@@ -130,10 +130,17 @@ mfi_disk_attach(device_t dev)
 		state = "unknown";
 		break;
 	}
-	device_printf(dev, "%juMB (%ju sectors) RAID volume '%s' is %s\n",
-		      sectors / (1024 * 1024 / secsize), sectors,
-		      ld_info->ld_config.properties.name,
-		      state);
+
+        if ( strlen(ld_info->ld_config.properties.name) == 0 ) {
+                device_printf(dev, 
+                      "%juMB (%ju sectors) RAID volume (no label) is %s\n",
+                      sectors / (1024 * 1024 / secsize), sectors, state);
+        } else { 
+                device_printf(dev, 
+                      "%juMB (%ju sectors) RAID volume '%s' is %s\n",
+                      sectors / (1024 * 1024 / secsize), sectors,
+                      ld_info->ld_config.properties.name, state);
+        }
 
 	sc->ld_disk = disk_alloc();
 	sc->ld_disk->d_drv1 = sc;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206071854.q57IsgLg005472>