Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Oct 2012 15:48:42 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r241951 - stable/9/sys/geom/raid
Message-ID:  <201210231548.q9NFmguH002384@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Tue Oct 23 15:48:42 2012
New Revision: 241951
URL: http://svn.freebsd.org/changeset/base/241951

Log:
  MFC r241418:
  NULL-ify last previously used pointer instead of last possible pointer.
  This should be only a cosmetic change.

Modified:
  stable/9/sys/geom/raid/md_promise.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/raid/md_promise.c
==============================================================================
--- stable/9/sys/geom/raid/md_promise.c	Tue Oct 23 15:46:02 2012	(r241950)
+++ stable/9/sys/geom/raid/md_promise.c	Tue Oct 23 15:48:42 2012	(r241951)
@@ -544,7 +544,7 @@ g_raid_md_promise_purge_disks(struct g_r
 			free(pd->pd_meta[i], M_MD_PROMISE);
 			for (j = i; j < pd->pd_subdisks - 1; j++)
 				pd->pd_meta[j] = pd->pd_meta[j + 1];
-			pd->pd_meta[PROMISE_MAX_SUBDISKS - 1] = NULL;
+			pd->pd_meta[pd->pd_subdisks - 1] = NULL;
 			pd->pd_subdisks--;
 			pd->pd_updated = 1;
 		}
@@ -650,7 +650,7 @@ g_raid_md_promise_start_disk(struct g_ra
 			free(pd->pd_meta[sdn], M_MD_PROMISE);
 			for (i = sdn; i < pd->pd_subdisks - 1; i++)
 				pd->pd_meta[i] = pd->pd_meta[i + 1];
-			pd->pd_meta[PROMISE_MAX_SUBDISKS - 1] = NULL;
+			pd->pd_meta[pd->pd_subdisks - 1] = NULL;
 			pd->pd_subdisks--;
 		}
 		/* If we are in the start process, that's all for now. */
@@ -1094,7 +1094,7 @@ g_raid_md_taste_promise(struct g_raid_md
 		free(metaarr[i], M_MD_PROMISE);
 		for (j = i; j < subdisks - 1; j++)
 			metaarr[i] = metaarr[j + 1];
-		metaarr[PROMISE_MAX_SUBDISKS - 1] = NULL;
+		metaarr[subdisks - 1] = NULL;
 		subdisks--;
 	}
 



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