Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Jul 2010 08:55:52 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r209986 - stable/7/sys/dev/md
Message-ID:  <201007130855.o6D8tqgE075181@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Tue Jul 13 08:55:52 2010
New Revision: 209986
URL: http://svn.freebsd.org/changeset/base/209986

Log:
  MFC r209743:
  Calculate nshift only once.

Modified:
  stable/7/sys/dev/md/md.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/md/md.c
==============================================================================
--- stable/7/sys/dev/md/md.c	Tue Jul 13 08:53:41 2010	(r209985)
+++ stable/7/sys/dev/md/md.c	Tue Jul 13 08:55:52 2010	(r209986)
@@ -252,7 +252,7 @@ dimension(off_t size)
 {
 	off_t rcnt;
 	struct indir *ip;
-	int i, layer;
+	int layer;
 
 	rcnt = size;
 	layer = 0;
@@ -260,9 +260,6 @@ dimension(off_t size)
 		rcnt /= NINDIR;
 		layer++;
 	}
-	/* figure out log2(NINDIR) */
-	for (i = NINDIR, nshift = -1; i; nshift++)
-		i >>= 1;
 
 	/*
 	 * XXX: the top layer is probably not fully populated, so we allocate
@@ -1203,6 +1200,11 @@ g_md_init(struct g_class *mp __unused)
 	caddr_t c;
 	u_char *ptr, *name, *type;
 	unsigned len;
+	int i;
+
+	/* figure out log2(NINDIR) */
+	for (i = NINDIR, nshift = -1; i; nshift++)
+		i >>= 1;
 
 	mod = NULL;
 	sx_init(&md_sx, "MD config lock");



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