Commit e39526e6 authored by Ed L. Cashin's avatar Ed L. Cashin Committed by Greg Kroah-Hartman
Browse files

[PATCH] aoe [1/2]: support 16 AoE slot addresses per AoE shelf 



Change the number of supported AoE slot addresses per AoE shelf
address to 16.

Signed-off-by: default avatarEd L. Cashin <ecashin@coraid.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0a25e4d5

Documentation/aoe/mkshelf.sh

+4 −2
Original line number Diff line number Diff line
@@ -8,13 +8,15 @@ fi 
n_partitions=${n_partitions:-16}

dir=$1

shelf=$2

nslots=16

maxslot=`echo $nslots 1 - p | dc`

MAJOR=152



set -e



minor=`echo 10 \* $shelf \* $n_partitions | bc`

minor=`echo $nslots \* $shelf \* $n_partitions | bc`

endp=`echo $n_partitions - 1 | bc`

for slot in `seq 0 9`; do

for slot in `seq 0 $maxslot`; do

	for part in `seq 0 $endp`; do

		name=e$shelf.$slot

		test "$part" != "0" && name=${name}p$part

drivers/block/aoe/aoe.h

+5 −5
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ 
 * default is 16, which is 15 partitions plus the whole disk

 */

#ifndef AOE_PARTITIONS

#define AOE_PARTITIONS 16

#define AOE_PARTITIONS (16)

#endif



#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * 10 + (aoeminor))

#define AOEMAJOR(sysminor) ((sysminor) / 10)

#define AOEMINOR(sysminor) ((sysminor) % 10)

#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * NPERSHELF + (aoeminor))

#define AOEMAJOR(sysminor) ((sysminor) / NPERSHELF)

#define AOEMINOR(sysminor) ((sysminor) % NPERSHELF)

#define WHITESPACE " \t\v\f\n"



enum {
@@ -83,7 +83,7 @@ enum { 


enum {

	MAXATADATA = 1024,

	NPERSHELF = 10,

	NPERSHELF = 16,		/* number of slots per shelf address */

	FREETAG = -1,

	MIN_BUFS = 8,

};