diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 13:32:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 13:32:56 -0700 |
| commit | 862aad56dcd67fd0313db51d09a5269f7e3f1f0b (patch) | |
| tree | 1729d49a6f13a9cd5a4da5cf499d3e76da9620d6 /drivers | |
| parent | cc6120c6687c34501c0b1d49b4d7e46c63911fed (diff) | |
| parent | d58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (diff) | |
| download | linux-862aad56dcd67fd0313db51d09a5269f7e3f1f0b.tar.gz linux-862aad56dcd67fd0313db51d09a5269f7e3f1f0b.tar.bz2 linux-862aad56dcd67fd0313db51d09a5269f7e3f1f0b.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/aoe/aoe.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h index 721ba8086043..0e9e586e9ba3 100644 --- a/drivers/block/aoe/aoe.h +++ b/drivers/block/aoe/aoe.h @@ -1,5 +1,5 @@ /* Copyright (c) 2004 Coraid, Inc. See COPYING for GPL terms. */ -#define VERSION "10" +#define VERSION "12" #define AOE_MAJOR 152 #define DEVICE_NAME "aoe" @@ -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, }; |