From: viro@www.linux.org.uk
new helper - iminor(inode); defined as minor(inode->i_rdev); lots and lots
of places in drivers had been switched to it.
arch/cris/arch-v10/drivers/eeprom.c | 2 +-
arch/cris/arch-v10/drivers/gpio.c | 2 +-
arch/i386/kernel/cpuid.c | 4 ++--
arch/i386/kernel/msr.c | 6 +++---
arch/mips/sibyte/sb1250/bcm1250_tbprof.c | 4 ++--
arch/ppc/8xx_io/cs4218_tdm.c | 4 ++--
arch/sparc/kernel/sys_sunos.c | 2 +-
arch/sparc64/kernel/sys_sunos32.c | 2 +-
arch/sparc64/solaris/misc.c | 2 +-
arch/sparc64/solaris/socksys.c | 4 ++--
arch/sparc64/solaris/timod.c | 2 +-
arch/x86_64/kernel/msr.c | 6 +++---
drivers/acorn/block/fd1772.c | 6 +++---
drivers/block/acsi_slm.c | 10 +++++-----
drivers/block/amiflop.c | 8 ++++----
drivers/block/ataflop.c | 2 +-
drivers/block/cciss.c | 8 ++++----
drivers/block/cpqarray.c | 2 +-
drivers/block/floppy.c | 6 +++---
drivers/block/floppy98.c | 6 +++---
drivers/block/paride/pg.c | 4 +---
drivers/block/paride/pt.c | 14 +++++++-------
drivers/block/rd.c | 2 +-
drivers/block/z2ram.c | 2 +-
drivers/char/agp/frontend.c | 2 +-
drivers/char/busmouse.c | 4 ++--
drivers/char/drm/drm_drv.h | 2 +-
drivers/char/drm/drm_fops.h | 2 +-
drivers/char/drm/drm_stub.h | 2 +-
drivers/char/dsp56k.c | 12 ++++++------
drivers/char/dtlk.c | 8 ++++----
drivers/char/ftape/zftape/zftape-init.c | 16 ++++++++--------
drivers/char/ip2main.c | 6 +++---
drivers/char/ipmi/ipmi_devintf.c | 2 +-
drivers/char/ipmi/ipmi_watchdog.c | 4 ++--
drivers/char/istallion.c | 6 +++---
drivers/char/ite_gpio.c | 2 +-
drivers/char/lp.c | 10 +++++-----
drivers/char/lp_old98.c | 2 +-
drivers/char/mem.c | 2 +-
drivers/char/misc.c | 2 +-
drivers/char/ppdev.c | 10 +++++-----
drivers/char/raw.c | 4 ++--
drivers/char/scx200_gpio.c | 6 +++---
drivers/char/stallion.c | 2 +-
drivers/char/tipar.c | 10 ++++------
drivers/char/tpqic02.c | 8 ++++----
drivers/char/vc_screen.c | 8 ++++----
drivers/char/watchdog/acquirewdt.c | 4 ++--
drivers/char/watchdog/cpu5wdt.c | 4 ++--
drivers/char/watchdog/ib700wdt.c | 4 ++--
drivers/char/watchdog/machzwd.c | 4 ++--
drivers/char/watchdog/pcwd.c | 6 +++---
drivers/char/watchdog/wdt.c | 6 +++---
drivers/char/watchdog/wdt_pci.c | 6 +++---
drivers/i2c/i2c-dev.c | 8 ++++----
drivers/ide/ide-tape.c | 6 +++---
drivers/ieee1394/ieee1394_core.c | 2 +-
drivers/ieee1394/ieee1394_core.h | 2 +-
drivers/ieee1394/pcilynx.c | 2 +-
drivers/input/evdev.c | 2 +-
drivers/input/input.c | 2 +-
drivers/input/joydev.c | 2 +-
drivers/input/mousedev.c | 2 +-
drivers/input/tsdev.c | 2 +-
drivers/isdn/capi/capi.c | 2 +-
drivers/isdn/hardware/eicon/divasi.c | 2 +-
drivers/isdn/i4l/isdn_common.c | 4 ++--
drivers/isdn/i4l/isdn_ppp.c | 2 +-
drivers/macintosh/adb.c | 2 +-
drivers/md/md.c | 7 ++-----
drivers/media/common/saa7146_fops.c | 2 +-
drivers/media/dvb/dvb-core/dvbdev.c | 2 +-
drivers/media/video/bttv-driver.c | 4 ++--
drivers/media/video/saa7134/saa7134-oss.c | 4 ++--
drivers/media/video/saa7134/saa7134-ts.c | 2 +-
drivers/media/video/saa7134/saa7134-video.c | 2 +-
drivers/media/video/stradis.c | 2 +-
drivers/media/video/tvmixer.c | 2 +-
drivers/media/video/videodev.c | 4 ++--
drivers/mtd/mtdchar.c | 2 +-
drivers/net/wan/cosa.c | 6 +++---
drivers/pcmcia/ds.c | 12 ++++++------
drivers/s390/char/tape_char.c | 8 ++++----
drivers/s390/char/tubio.h | 2 +-
drivers/sbus/char/bpp.c | 10 +++++-----
drivers/sbus/char/cpwatchdog.c | 2 +-
drivers/sbus/char/display7seg.c | 4 ++--
drivers/sbus/char/vfc_dev.c | 10 +++++-----
drivers/scsi/3w-xxxx.c | 4 ++--
drivers/scsi/aacraid/linit.c | 4 ++--
drivers/scsi/dpt_i2o.c | 6 +++---
drivers/scsi/osst.c | 14 +++++++-------
drivers/scsi/sg.c | 2 +-
drivers/scsi/st.c | 10 +++++-----
drivers/telephony/ixj.c | 22 +++++++++++-----------
drivers/telephony/phonedev.c | 2 +-
drivers/usb/class/audio.c | 4 ++--
drivers/usb/class/usb-midi.c | 2 +-
drivers/usb/class/usblp.c | 2 +-
drivers/usb/core/file.c | 2 +-
drivers/usb/image/scanner.h | 2 +-
drivers/usb/input/hiddev.c | 2 +-
drivers/usb/media/dabusb.c | 2 +-
drivers/usb/misc/auerswald.c | 2 +-
drivers/usb/misc/brlvger.c | 2 +-
drivers/usb/misc/tiglusb.c | 2 +-
drivers/usb/usb-skeleton.c | 2 +-
drivers/video/fbmem.c | 12 ++++++------
drivers/video/stifb.c | 4 ++--
fs/coda/inode.c | 2 +-
fs/coda/psdev.c | 2 +-
fs/jffs2/file.c | 2 +-
fs/jffs2/os-linux.h | 2 +-
include/linux/fs.h | 5 +++++
include/linux/nfsd/nfsfh.h | 2 +-
net/netlink/netlink_dev.c | 12 ++++++------
sound/core/control.c | 2 +-
sound/core/hwdep.c | 6 +++---
sound/core/oss/mixer_oss.c | 2 +-
sound/core/oss/pcm_oss.c | 2 +-
sound/core/pcm_native.c | 6 +++---
sound/core/rawmidi.c | 8 ++++----
sound/core/seq/oss/seq_oss.c | 2 +-
sound/core/sound.c | 2 +-
sound/oss/ad1889.c | 4 ++--
sound/oss/ali5455.c | 2 +-
sound/oss/au1000.c | 2 +-
sound/oss/btaudio.c | 6 +++---
sound/oss/cmpci.c | 8 ++++----
sound/oss/cs4281/cs4281m.c | 6 +++---
sound/oss/cs46xx.c | 8 ++++----
sound/oss/dmasound/dmasound_core.c | 2 +-
sound/oss/emu10k1/audio.c | 2 +-
sound/oss/emu10k1/midi.c | 2 +-
sound/oss/emu10k1/mixer.c | 2 +-
sound/oss/es1370.c | 8 ++++----
sound/oss/es1371.c | 8 ++++----
sound/oss/esssolo1.c | 8 ++++----
sound/oss/hal2.c | 4 ++--
sound/oss/i810_audio.c | 2 +-
sound/oss/ite8172.c | 4 ++--
sound/oss/maestro.c | 4 ++--
sound/oss/maestro3.c | 4 ++--
sound/oss/msnd_pinnacle.c | 10 +++++-----
sound/oss/nec_vrc5477.c | 4 ++--
sound/oss/rme96xx.c | 4 ++--
sound/oss/sonicvibes.c | 8 ++++----
sound/oss/soundcard.c | 14 +++++++-------
sound/oss/swarm_cs4297a.c | 4 ++--
sound/oss/trident.c | 4 ++--
sound/oss/via82cxxx_audio.c | 4 ++--
sound/oss/vwsnd.c | 4 ++--
sound/oss/ymfpci.c | 4 ++--
sound/sound_core.c | 2 +-
155 files changed, 356 insertions(+), 358 deletions(-)
diff -puN arch/cris/arch-v10/drivers/eeprom.c~large-dev_t-10 arch/cris/arch-v10/drivers/eeprom.c
--- 25/arch/cris/arch-v10/drivers/eeprom.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/cris/arch-v10/drivers/eeprom.c 2003-08-26 18:29:24.000000000 -0700
@@ -441,7 +441,7 @@ int __init eeprom_init(void)
static int eeprom_open(struct inode * inode, struct file * file)
{
- if(minor(inode->i_rdev) != EEPROM_MINOR_NR)
+ if(iminor(inode) != EEPROM_MINOR_NR)
return -ENXIO;
if(major(inode->i_rdev) != EEPROM_MAJOR_NR)
return -ENXIO;
diff -puN arch/cris/arch-v10/drivers/gpio.c~large-dev_t-10 arch/cris/arch-v10/drivers/gpio.c
--- 25/arch/cris/arch-v10/drivers/gpio.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/cris/arch-v10/drivers/gpio.c 2003-08-26 18:29:24.000000000 -0700
@@ -386,7 +386,7 @@ static int
gpio_open(struct inode *inode, struct file *filp)
{
struct gpio_private *priv;
- int p = minor(inode->i_rdev);
+ int p = iminor(inode);
if (p > GPIO_MINOR_LAST)
return -EINVAL;
diff -puN arch/i386/kernel/cpuid.c~large-dev_t-10 arch/i386/kernel/cpuid.c
--- 25/arch/i386/kernel/cpuid.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/i386/kernel/cpuid.c 2003-08-26 18:29:24.000000000 -0700
@@ -115,7 +115,7 @@ static ssize_t cpuid_read(struct file *
u32 data[4];
size_t rv;
u32 reg = *ppos;
- int cpu = minor(file->f_dentry->d_inode->i_rdev);
+ int cpu = iminor(file->f_dentry->d_inode);
if ( count % 16 )
return -EINVAL; /* Invalid chunk size */
@@ -133,7 +133,7 @@ static ssize_t cpuid_read(struct file *
static int cpuid_open(struct inode *inode, struct file *file)
{
- int cpu = minor(file->f_dentry->d_inode->i_rdev);
+ int cpu = iminor(file->f_dentry->d_inode);
struct cpuinfo_x86 *c = &(cpu_data)[cpu];
if (!cpu_online(cpu))
diff -puN arch/i386/kernel/msr.c~large-dev_t-10 arch/i386/kernel/msr.c
--- 25/arch/i386/kernel/msr.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/i386/kernel/msr.c 2003-08-26 18:29:24.000000000 -0700
@@ -194,7 +194,7 @@ static ssize_t msr_read(struct file * fi
u32 data[2];
size_t rv;
u32 reg = *ppos;
- int cpu = minor(file->f_dentry->d_inode->i_rdev);
+ int cpu = iminor(file->f_dentry->d_inode);
int err;
if ( count % 8 )
@@ -219,7 +219,7 @@ static ssize_t msr_write(struct file * f
u32 data[2];
size_t rv;
u32 reg = *ppos;
- int cpu = minor(file->f_dentry->d_inode->i_rdev);
+ int cpu = iminor(file->f_dentry->d_inode);
int err;
if ( count % 8 )
@@ -239,7 +239,7 @@ static ssize_t msr_write(struct file * f
static int msr_open(struct inode *inode, struct file *file)
{
- int cpu = minor(file->f_dentry->d_inode->i_rdev);
+ int cpu = iminor(file->f_dentry->d_inode);
struct cpuinfo_x86 *c = &(cpu_data)[cpu];
if (!cpu_online(cpu))
diff -puN arch/mips/sibyte/sb1250/bcm1250_tbprof.c~large-dev_t-10 arch/mips/sibyte/sb1250/bcm1250_tbprof.c
--- 25/arch/mips/sibyte/sb1250/bcm1250_tbprof.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/mips/sibyte/sb1250/bcm1250_tbprof.c 2003-08-26 18:29:24.000000000 -0700
@@ -253,7 +253,7 @@ static int sbprof_tb_open(struct inode *
{
int minor;
- minor = minor(inode->i_rdev);
+ minor = iminor(inode);
if (minor != 0) {
return -ENODEV;
}
@@ -278,7 +278,7 @@ static int sbprof_tb_release(struct inod
{
int minor;
- minor = minor(inode->i_rdev);
+ minor = iminor(inode);
if (minor != 0 || !sbp.open) {
return -ENODEV;
}
diff -puN arch/ppc/8xx_io/cs4218_tdm.c~large-dev_t-10 arch/ppc/8xx_io/cs4218_tdm.c
--- 25/arch/ppc/8xx_io/cs4218_tdm.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/ppc/8xx_io/cs4218_tdm.c 2003-08-26 18:29:24.000000000 -0700
@@ -2106,11 +2106,11 @@ static int sq_open(struct inode *inode,
*/
cs4218_ctl_write(cs4218_control);
- sound.minDev = MINOR(inode->i_rdev) & 0x0f;
+ sound.minDev = iminor(inode) & 0x0f;
sound.soft = sound.dsp;
sound.hard = sound.dsp;
sound_init();
- if ((MINOR(inode->i_rdev) & 0x0f) == SND_DEV_AUDIO) {
+ if ((iminor(inode) & 0x0f) == SND_DEV_AUDIO) {
sound_set_speed(8000);
sound_set_stereo(0);
sound_set_format(AFMT_MU_LAW);
diff -puN arch/sparc64/kernel/sys_sunos32.c~large-dev_t-10 arch/sparc64/kernel/sys_sunos32.c
--- 25/arch/sparc64/kernel/sys_sunos32.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/sparc64/kernel/sys_sunos32.c 2003-08-26 18:29:24.000000000 -0700
@@ -90,7 +90,7 @@ asmlinkage u32 sunos_mmap(u32 addr, u32
if (!file)
goto out;
inode = file->f_dentry->d_inode;
- if (minor(inode->i_rdev) == MEM_MAJOR && minor(inode->i_rdev) == 5) {
+ if (major(inode->i_rdev) == MEM_MAJOR && iminor(inode) == 5) {
flags |= MAP_ANONYMOUS;
fput(file);
file = NULL;
diff -puN arch/sparc64/solaris/misc.c~large-dev_t-10 arch/sparc64/solaris/misc.c
--- 25/arch/sparc64/solaris/misc.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/sparc64/solaris/misc.c 2003-08-26 18:29:24.000000000 -0700
@@ -78,7 +78,7 @@ static u32 do_solaris_mmap(u32 addr, u32
else {
struct inode * inode = file->f_dentry->d_inode;
if(major(inode->i_rdev) == MEM_MAJOR &&
- minor(inode->i_rdev) == 5) {
+ iminor(inode) == 5) {
flags |= MAP_ANONYMOUS;
fput(file);
file = NULL;
diff -puN arch/sparc64/solaris/socksys.c~large-dev_t-10 arch/sparc64/solaris/socksys.c
--- 25/arch/sparc64/solaris/socksys.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/sparc64/solaris/socksys.c 2003-08-26 18:29:24.000000000 -0700
@@ -70,14 +70,14 @@ static int socksys_open(struct inode * i
(int (*)(int,int,int))SUNOS(97);
struct sol_socket_struct * sock;
- family = ((minor(inode->i_rdev) >> 4) & 0xf);
+ family = ((iminor(inode) >> 4) & 0xf);
switch (family) {
case AF_UNIX:
type = SOCK_STREAM;
protocol = 0;
break;
case AF_INET:
- protocol = af_inet_protocols[minor(inode->i_rdev) & 0xf];
+ protocol = af_inet_protocols[iminor(inode) & 0xf];
switch (protocol) {
case IPPROTO_TCP: type = SOCK_STREAM; break;
case IPPROTO_UDP: type = SOCK_DGRAM; break;
diff -puN arch/sparc64/solaris/timod.c~large-dev_t-10 arch/sparc64/solaris/timod.c
--- 25/arch/sparc64/solaris/timod.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/sparc64/solaris/timod.c 2003-08-26 18:29:24.000000000 -0700
@@ -924,7 +924,7 @@ asmlinkage int solaris_putmsg(unsigned i
if (!ino) goto out;
if (!ino->i_sock &&
- (major(ino->i_rdev) != 30 || minor(ino->i_rdev) != 1))
+ (major(ino->i_rdev) != 30 || iminor(ino) != 1))
goto out;
ctlptr = (struct strbuf *)A(arg1);
diff -puN arch/sparc/kernel/sys_sunos.c~large-dev_t-10 arch/sparc/kernel/sys_sunos.c
--- 25/arch/sparc/kernel/sys_sunos.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/sparc/kernel/sys_sunos.c 2003-08-26 18:29:24.000000000 -0700
@@ -93,7 +93,7 @@ asmlinkage unsigned long sunos_mmap(unsi
*/
if (file) {
if(major(file->f_dentry->d_inode->i_rdev) == MEM_MAJOR &&
- minor(file->f_dentry->d_inode->i_rdev) == 5) {
+ iminor(file->f_dentry->d_inode) == 5) {
flags |= MAP_ANONYMOUS;
fput(file);
file = 0;
diff -puN arch/x86_64/kernel/msr.c~large-dev_t-10 arch/x86_64/kernel/msr.c
--- 25/arch/x86_64/kernel/msr.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/arch/x86_64/kernel/msr.c 2003-08-26 18:29:24.000000000 -0700
@@ -194,7 +194,7 @@ static ssize_t msr_read(struct file * fi
u32 data[2];
size_t rv;
u32 reg = *ppos;
- int cpu = minor(file->f_dentry->d_inode->i_rdev);
+ int cpu = iminor(file->f_dentry->d_inode);
int err;
if ( count % 8 )
@@ -219,7 +219,7 @@ static ssize_t msr_write(struct file * f
u32 data[2];
size_t rv;
u32 reg = *ppos;
- int cpu = minor(file->f_dentry->d_inode->i_rdev);
+ int cpu = iminor(file->f_dentry->d_inode);
int err;
if ( count % 8 )
@@ -239,7 +239,7 @@ static ssize_t msr_write(struct file * f
static int msr_open(struct inode *inode, struct file *file)
{
- int cpu = minor(file->f_dentry->d_inode->i_rdev);
+ int cpu = iminor(file->f_dentry->d_inode);
struct cpuinfo_x86 *c = &(cpu_data)[cpu];
if (!cpu_online(cpu))
diff -puN drivers/acorn/block/fd1772.c~large-dev_t-10 drivers/acorn/block/fd1772.c
--- 25/drivers/acorn/block/fd1772.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/acorn/block/fd1772.c 2003-08-26 18:29:24.000000000 -0700
@@ -1455,8 +1455,8 @@ static void config_types(void)
static int floppy_open(struct inode *inode, struct file *filp)
{
- int drive = minor(inode->i_rdev) & 3;
- int type = minor(inode->i_rdev) >> 2;
+ int drive = iminor(inode) & 3;
+ int type = iminor(inode) >> 2;
int old_dev = fd_device[drive];
if (fd_ref[drive] && old_dev != type)
@@ -1490,7 +1490,7 @@ static int floppy_open(struct inode *ino
static int floppy_release(struct inode *inode, struct file *filp)
{
- int drive = minor(inode->i_rdev) & 3;
+ int drive = iminor(inode) & 3;
if (fd_ref[drive] < 0)
fd_ref[drive] = 0;
diff -puN drivers/block/acsi_slm.c~large-dev_t-10 drivers/block/acsi_slm.c
--- 25/drivers/block/acsi_slm.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/acsi_slm.c 2003-08-26 18:29:24.000000000 -0700
@@ -374,7 +374,7 @@ static ssize_t slm_read( struct file *fi
if (!(page = __get_free_page( GFP_KERNEL )))
return( -ENOMEM );
- length = slm_getstats( (char *)page, MINOR(node->i_rdev) );
+ length = slm_getstats( (char *)page, iminor(node) );
if (length < 0) {
count = length;
goto out;
@@ -622,7 +622,7 @@ static ssize_t slm_write( struct file *f
{
struct inode *node = file->f_dentry->d_inode;
- int device = MINOR( node->i_rdev );
+ int device = iminor(node);
int n, filled, w, h;
while( SLMState == PRINTING ||
@@ -694,7 +694,7 @@ static ssize_t slm_write( struct file *f
static int slm_ioctl( struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg )
-{ int device = MINOR( inode->i_rdev ), err;
+{ int device = iminor(inode), err;
/* I can think of setting:
* - manual feed
@@ -768,7 +768,7 @@ static int slm_open( struct inode *inode
{ int device;
struct slm *sip;
- device = MINOR(inode->i_rdev);
+ device = iminor(inode);
if (device >= N_SLM_Printers)
return( -ENXIO );
sip = &slm_info[device];
@@ -797,7 +797,7 @@ static int slm_release( struct inode *in
{ int device;
struct slm *sip;
- device = MINOR(inode->i_rdev);
+ device = iminor(inode);
sip = &slm_info[device];
if (file->f_mode & 2)
diff -puN drivers/block/amiflop.c~large-dev_t-10 drivers/block/amiflop.c
--- 25/drivers/block/amiflop.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/amiflop.c 2003-08-26 18:29:24.000000000 -0700
@@ -1437,7 +1437,7 @@ static void do_fd_request(request_queue_
static int fd_ioctl(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long param)
{
- int drive = minor(inode->i_rdev) & 3;
+ int drive = iminor(inode) & 3;
static struct floppy_struct getprm;
switch(cmd){
@@ -1561,8 +1561,8 @@ static void fd_probe(int dev)
*/
static int floppy_open(struct inode *inode, struct file *filp)
{
- int drive = minor(inode->i_rdev) & 3;
- int system = (minor(inode->i_rdev) & 4) >> 2;
+ int drive = iminor(inode) & 3;
+ int system = (iminor(inode) & 4) >> 2;
int old_dev;
unsigned long flags;
@@ -1609,7 +1609,7 @@ static int floppy_open(struct inode *ino
static int floppy_release(struct inode * inode, struct file * filp)
{
- int drive = minor(inode->i_rdev) & 3;
+ int drive = iminor(inode) & 3;
if (unit[drive].dirty == 1) {
del_timer (flush_track_timer + drive);
diff -puN drivers/block/ataflop.c~large-dev_t-10 drivers/block/ataflop.c
--- 25/drivers/block/ataflop.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/ataflop.c 2003-08-26 18:29:24.000000000 -0700
@@ -1819,7 +1819,7 @@ static void __init config_types( void )
static int floppy_open( struct inode *inode, struct file *filp )
{
struct atari_floppy_struct *p = inode->i_bdev->bd_disk->private_data;
- int type = minor(inode->i_rdev) >> 2;
+ int type = iminor(inode) >> 2;
DPRINT(("fd_open: type=%d\n",type));
if (p->ref && p->type != type)
diff -puN drivers/block/cciss.c~large-dev_t-10 drivers/block/cciss.c
--- 25/drivers/block/cciss.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/cciss.c 2003-08-26 18:29:24.000000000 -0700
@@ -357,7 +357,7 @@ static void cmd_free(ctlr_info_t *h, Com
static int cciss_open(struct inode *inode, struct file *filep)
{
int ctlr = major(inode->i_rdev) - COMPAQ_CISS_MAJOR;
- int dsk = minor(inode->i_rdev) >> NWD_SHIFT;
+ int dsk = iminor(inode) >> NWD_SHIFT;
#ifdef CCISS_DEBUG
printk(KERN_DEBUG "cciss_open %x (%x:%x)\n", inode->i_rdev, ctlr, dsk);
@@ -372,7 +372,7 @@ static int cciss_open(struct inode *inod
* for "raw controller".
*/
if (hba[ctlr]->drv[dsk].nr_blocks == 0) {
- if (minor(inode->i_rdev) != 0)
+ if (iminor(inode) != 0)
return -ENXIO;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
@@ -387,7 +387,7 @@ static int cciss_open(struct inode *inod
static int cciss_release(struct inode *inode, struct file *filep)
{
int ctlr = major(inode->i_rdev) - COMPAQ_CISS_MAJOR;
- int dsk = minor(inode->i_rdev) >> NWD_SHIFT;
+ int dsk = iminor(inode) >> NWD_SHIFT;
#ifdef CCISS_DEBUG
printk(KERN_DEBUG "cciss_release %x (%x:%x)\n", inode->i_rdev, ctlr, dsk);
@@ -407,7 +407,7 @@ static int cciss_ioctl(struct inode *ino
unsigned int cmd, unsigned long arg)
{
int ctlr = major(inode->i_rdev) - COMPAQ_CISS_MAJOR;
- int dsk = minor(inode->i_rdev) >> NWD_SHIFT;
+ int dsk = iminor(inode) >> NWD_SHIFT;
#ifdef CCISS_DEBUG
printk(KERN_DEBUG "cciss_ioctl: Called with cmd=%x %lx\n", cmd, arg);
diff -puN drivers/block/cpqarray.c~large-dev_t-10 drivers/block/cpqarray.c
--- 25/drivers/block/cpqarray.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/cpqarray.c 2003-08-26 18:29:24.000000000 -0700
@@ -1078,7 +1078,7 @@ out_passthru:
put_user(host->ctlr_sig, (int*)arg);
return 0;
case IDAREVALIDATEVOLS:
- if (minor(inode->i_rdev) != 0)
+ if (iminor(inode) != 0)
return -ENXIO;
return revalidate_allvol(host);
case IDADRIVERVERSION:
diff -puN drivers/block/floppy98.c~large-dev_t-10 drivers/block/floppy98.c
--- 25/drivers/block/floppy98.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/floppy98.c 2003-08-26 18:29:24.000000000 -0700
@@ -3844,9 +3844,9 @@ static int floppy_open(struct inode * in
}
}
- UDRS->fd_device = minor(inode->i_rdev);
- set_capacity(disks[drive], floppy_sizes[minor(inode->i_rdev)]);
- if (old_dev != -1 && old_dev != minor(inode->i_rdev)) {
+ UDRS->fd_device = iminor(inode);
+ set_capacity(disks[drive], floppy_sizes[iminor(inode)]);
+ if (old_dev != -1 && old_dev != iminor(inode)) {
if (buffer_drive == drive)
buffer_track = -1;
}
diff -puN drivers/block/floppy.c~large-dev_t-10 drivers/block/floppy.c
--- 25/drivers/block/floppy.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/floppy.c 2003-08-26 18:29:24.000000000 -0700
@@ -3781,9 +3781,9 @@ static int floppy_open(struct inode * in
}
}
- UDRS->fd_device = minor(inode->i_rdev);
- set_capacity(disks[drive], floppy_sizes[minor(inode->i_rdev)]);
- if (old_dev != -1 && old_dev != minor(inode->i_rdev)) {
+ UDRS->fd_device = iminor(inode);
+ set_capacity(disks[drive], floppy_sizes[iminor(inode)]);
+ if (old_dev != -1 && old_dev != iminor(inode)) {
if (buffer_drive == drive)
buffer_track = -1;
}
diff -puN drivers/block/paride/pg.c~large-dev_t-10 drivers/block/paride/pg.c
--- 25/drivers/block/paride/pg.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/paride/pg.c 2003-08-26 18:29:24.000000000 -0700
@@ -527,11 +527,9 @@ static int pg_detect(void)
return -1;
}
-#define DEVICE_NR(dev) (minor(dev) & 0x7F)
-
static int pg_open(struct inode *inode, struct file *file)
{
- int unit = DEVICE_NR(inode->i_rdev);
+ int unit = iminor(inode) & 0x7f;
struct pg *dev = &devices[unit];
if ((unit >= PG_UNITS) || (!dev->present))
diff -puN drivers/block/paride/pt.c~large-dev_t-10 drivers/block/paride/pt.c
--- 25/drivers/block/paride/pt.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/paride/pt.c 2003-08-26 18:29:24.000000000 -0700
@@ -670,11 +670,11 @@ static int pt_detect(void)
return -1;
}
-#define DEVICE_NR(dev) (minor(dev) & 0x7F)
+#define DEVICE_NR(inode) (iminor(inode) & 0x7F)
static int pt_open(struct inode *inode, struct file *file)
{
- int unit = DEVICE_NR(inode->i_rdev);
+ int unit = DEVICE_NR(inode);
if ((unit >= PT_UNITS) || (!PT.present))
return -ENODEV;
@@ -696,7 +696,7 @@ static int pt_open(struct inode *inode,
return -EROFS;
}
- if (!(minor(inode->i_rdev) & 128))
+ if (!(iminor(inode) & 128))
PT.flags |= PT_REWIND;
PT.bufptr = kmalloc(PT_BUFSIZE, GFP_KERNEL);
@@ -715,7 +715,7 @@ static int pt_ioctl(struct inode *inode,
int unit;
struct mtop mtop;
- unit = DEVICE_NR(inode->i_rdev);
+ unit = DEVICE_NR(inode);
if (unit >= PT_UNITS)
return -EINVAL;
if (!PT.present)
@@ -753,7 +753,7 @@ static int pt_ioctl(struct inode *inode,
static int
pt_release(struct inode *inode, struct file *file)
{
- int unit = DEVICE_NR(inode->i_rdev);
+ int unit = DEVICE_NR(inode);
if ((unit >= PT_UNITS) || (atomic_read(&PT.available) > 1))
return -EINVAL;
@@ -776,7 +776,7 @@ pt_release(struct inode *inode, struct f
static ssize_t pt_read(struct file *filp, char *buf, size_t count, loff_t * ppos)
{
struct inode *ino = filp->f_dentry->d_inode;
- int unit = DEVICE_NR(ino->i_rdev);
+ int unit = DEVICE_NR(ino);
char rd_cmd[12] = { ATAPI_READ_6, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
int k, n, r, p, s, t, b;
@@ -873,7 +873,7 @@ static ssize_t pt_read(struct file *filp
static ssize_t pt_write(struct file *filp, const char *buf, size_t count, loff_t * ppos)
{
struct inode *ino = filp->f_dentry->d_inode;
- int unit = DEVICE_NR(ino->i_rdev);
+ int unit = DEVICE_NR(ino);
char wr_cmd[12] = { ATAPI_WRITE_6, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
int k, n, r, p, s, t, b;
diff -puN drivers/block/rd.c~large-dev_t-10 drivers/block/rd.c
--- 25/drivers/block/rd.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/rd.c 2003-08-26 18:29:24.000000000 -0700
@@ -275,7 +275,7 @@ static struct backing_dev_info rd_backin
static int rd_open(struct inode *inode, struct file *filp)
{
- unsigned unit = minor(inode->i_rdev);
+ unsigned unit = iminor(inode);
/*
* Immunize device against invalidate_buffers() and prune_icache().
diff -puN drivers/block/z2ram.c~large-dev_t-10 drivers/block/z2ram.c
--- 25/drivers/block/z2ram.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/block/z2ram.c 2003-08-26 18:29:24.000000000 -0700
@@ -150,7 +150,7 @@ z2_open( struct inode *inode, struct fil
sizeof( z2ram_map[0] );
int rc = -ENOMEM;
- device = minor( inode->i_rdev );
+ device = iminor(inode);
if ( current_device != -1 && current_device != device )
{
diff -puN drivers/char/agp/frontend.c~large-dev_t-10 drivers/char/agp/frontend.c
--- 25/drivers/char/agp/frontend.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/agp/frontend.c 2003-08-26 18:29:24.000000000 -0700
@@ -698,7 +698,7 @@ static int agp_release(struct inode *ino
static int agp_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct agp_file_private *priv;
struct agp_client *client;
int rc = -ENXIO;
diff -puN drivers/char/busmouse.c~large-dev_t-10 drivers/char/busmouse.c
--- 25/drivers/char/busmouse.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/busmouse.c 2003-08-26 18:29:24.000000000 -0700
@@ -51,7 +51,7 @@ struct busmouse_data {
#define NR_MICE 15
#define FIRST_MOUSE 0
-#define DEV_TO_MOUSE(dev) MINOR_TO_MOUSE(minor(dev))
+#define DEV_TO_MOUSE(inode) MINOR_TO_MOUSE(iminor(inode))
#define MINOR_TO_MOUSE(minor) ((minor) - FIRST_MOUSE)
/*
@@ -190,7 +190,7 @@ static int busmouse_open(struct inode *i
unsigned int mousedev;
int ret;
- mousedev = DEV_TO_MOUSE(inode->i_rdev);
+ mousedev = DEV_TO_MOUSE(inode);
if (mousedev >= NR_MICE)
return -EINVAL;
diff -puN drivers/char/drm/drm_drv.h~large-dev_t-10 drivers/char/drm/drm_drv.h
--- 25/drivers/char/drm/drm_drv.h~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/drm/drm_drv.h 2003-08-26 18:29:24.000000000 -0700
@@ -795,7 +795,7 @@ int DRM(open)( struct inode *inode, stru
int i;
for (i = 0; i < DRM(numdevs); i++) {
- if (minor(inode->i_rdev) == DRM(minor)[i]) {
+ if (iminor(inode) == DRM(minor)[i]) {
dev = &(DRM(device)[i]);
break;
}
diff -puN drivers/char/drm/drm_fops.h~large-dev_t-10 drivers/char/drm/drm_fops.h
--- 25/drivers/char/drm/drm_fops.h~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/drm/drm_fops.h 2003-08-26 18:29:24.000000000 -0700
@@ -51,7 +51,7 @@
*/
int DRM(open_helper)(struct inode *inode, struct file *filp, drm_device_t *dev)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
drm_file_t *priv;
if (filp->f_flags & O_EXCL) return -EBUSY; /* No exclusive opens */
diff -puN drivers/char/drm/drm_stub.h~large-dev_t-10 drivers/char/drm/drm_stub.h
--- 25/drivers/char/drm/drm_stub.h~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/drm/drm_stub.h 2003-08-26 18:29:24.000000000 -0700
@@ -62,7 +62,7 @@ static struct drm_stub_info {
*/
static int DRM(stub_open)(struct inode *inode, struct file *filp)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int err = -ENODEV;
struct file_operations *old_fops;
diff -puN drivers/char/dsp56k.c~large-dev_t-10 drivers/char/dsp56k.c
--- 25/drivers/char/dsp56k.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/dsp56k.c 2003-08-26 18:29:24.000000000 -0700
@@ -207,7 +207,7 @@ static ssize_t dsp56k_read(struct file *
loff_t *ppos)
{
struct inode *inode = file->f_dentry->d_inode;
- int dev = minor(inode->i_rdev) & 0x0f;
+ int dev = iminor(inode) & 0x0f;
switch(dev)
{
@@ -270,7 +270,7 @@ static ssize_t dsp56k_write(struct file
loff_t *ppos)
{
struct inode *inode = file->f_dentry->d_inode;
- int dev = minor(inode->i_rdev) & 0x0f;
+ int dev = iminor(inode) & 0x0f;
switch(dev)
{
@@ -331,7 +331,7 @@ static ssize_t dsp56k_write(struct file
static int dsp56k_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- int dev = minor(inode->i_rdev) & 0x0f;
+ int dev = iminor(inode) & 0x0f;
switch(dev)
{
@@ -424,7 +424,7 @@ static int dsp56k_ioctl(struct inode *in
#if 0
static unsigned int dsp56k_poll(struct file *file, poll_table *wait)
{
- int dev = minor(file->f_dentry->d_inode->i_rdev) & 0x0f;
+ int dev = iminor(file->f_dentry->d_inode) & 0x0f;
switch(dev)
{
@@ -441,7 +441,7 @@ static unsigned int dsp56k_poll(struct f
static int dsp56k_open(struct inode *inode, struct file *file)
{
- int dev = minor(inode->i_rdev) & 0x0f;
+ int dev = iminor(inode) & 0x0f;
switch(dev)
{
@@ -472,7 +472,7 @@ static int dsp56k_open(struct inode *ino
static int dsp56k_release(struct inode *inode, struct file *file)
{
- int dev = minor(inode->i_rdev) & 0x0f;
+ int dev = iminor(inode) & 0x0f;
switch(dev)
{
diff -puN drivers/char/dtlk.c~large-dev_t-10 drivers/char/dtlk.c
--- 25/drivers/char/dtlk.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/dtlk.c 2003-08-26 18:29:24.000000000 -0700
@@ -125,7 +125,7 @@ static void dtlk_timer_tick(unsigned lon
static ssize_t dtlk_read(struct file *file, char *buf,
size_t count, loff_t * ppos)
{
- unsigned int minor = minor(file->f_dentry->d_inode->i_rdev);
+ unsigned int minor = iminor(file->f_dentry->d_inode);
char ch;
int i = 0, retries;
@@ -185,7 +185,7 @@ static ssize_t dtlk_write(struct file *f
if (ppos != &file->f_pos)
return -ESPIPE;
- if (minor(file->f_dentry->d_inode->i_rdev) != DTLK_MINOR)
+ if (iminor(file->f_dentry->d_inode) != DTLK_MINOR)
return -EINVAL;
while (1) {
@@ -304,7 +304,7 @@ static int dtlk_open(struct inode *inode
{
TRACE_TEXT("(dtlk_open");
- switch (minor(inode->i_rdev)) {
+ switch (iminor(inode)) {
case DTLK_MINOR:
if (dtlk_busy)
return -EBUSY;
@@ -319,7 +319,7 @@ static int dtlk_release(struct inode *in
{
TRACE_TEXT("(dtlk_release");
- switch (minor(inode->i_rdev)) {
+ switch (iminor(inode)) {
case DTLK_MINOR:
break;
diff -puN drivers/char/ftape/zftape/zftape-init.c~large-dev_t-10 drivers/char/ftape/zftape/zftape-init.c
--- 25/drivers/char/ftape/zftape/zftape-init.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/ftape/zftape/zftape-init.c 2003-08-26 18:29:24.000000000 -0700
@@ -110,11 +110,11 @@ static int zft_open(struct inode *ino, s
int result;
TRACE_FUN(ft_t_flow);
- TRACE(ft_t_flow, "called for minor %d", minor(ino->i_rdev));
+ TRACE(ft_t_flow, "called for minor %d", iminor(ino));
if ( test_and_set_bit(0,&busy_flag) ) {
TRACE_ABORT(-EBUSY, ft_t_warn, "failed: already busy");
}
- if ((minor(ino->i_rdev) & ~(ZFT_MINOR_OP_MASK | FTAPE_NO_REWIND))
+ if ((iminor(ino) & ~(ZFT_MINOR_OP_MASK | FTAPE_NO_REWIND))
>
FTAPE_SEL_D) {
clear_bit(0,&busy_flag);
@@ -122,7 +122,7 @@ static int zft_open(struct inode *ino, s
}
orig_sigmask = current->blocked;
sigfillset(¤t->blocked);
- result = _zft_open(minor(ino->i_rdev), filep->f_flags & O_ACCMODE);
+ result = _zft_open(iminor(ino), filep->f_flags & O_ACCMODE);
if (result < 0) {
current->blocked = orig_sigmask; /* restore mask */
clear_bit(0,&busy_flag);
@@ -144,7 +144,7 @@ static int zft_close(struct inode *ino,
int result;
TRACE_FUN(ft_t_flow);
- if ( !test_bit(0,&busy_flag) || minor(ino->i_rdev) != zft_unit) {
+ if ( !test_bit(0,&busy_flag) || iminor(ino) != zft_unit) {
TRACE(ft_t_err, "failed: not busy or wrong unit");
TRACE_EXIT 0;
}
@@ -167,7 +167,7 @@ static int zft_ioctl(struct inode *ino,
sigset_t old_sigmask;
TRACE_FUN(ft_t_flow);
- if ( !test_bit(0,&busy_flag) || minor(ino->i_rdev) != zft_unit || ft_failure) {
+ if ( !test_bit(0,&busy_flag) || iminor(ino) != zft_unit || ft_failure) {
TRACE_ABORT(-EIO, ft_t_err,
"failed: not busy, failure or wrong unit");
}
@@ -188,7 +188,7 @@ static int zft_mmap(struct file *filep,
TRACE_FUN(ft_t_flow);
if ( !test_bit(0,&busy_flag) ||
- minor(filep->f_dentry->d_inode->i_rdev) != zft_unit ||
+ iminor(filep->f_dentry->d_inode) != zft_unit ||
ft_failure)
{
TRACE_ABORT(-EIO, ft_t_err,
@@ -217,7 +217,7 @@ static ssize_t zft_read(struct file *fp,
TRACE_FUN(ft_t_flow);
TRACE(ft_t_data_flow, "called with count: %ld", (unsigned long)req_len);
- if (!test_bit(0,&busy_flag) || minor(ino->i_rdev) != zft_unit || ft_failure) {
+ if (!test_bit(0,&busy_flag) || iminor(ino) != zft_unit || ft_failure) {
TRACE_ABORT(-EIO, ft_t_err,
"failed: not busy, failure or wrong unit");
}
@@ -240,7 +240,7 @@ static ssize_t zft_write(struct file *fp
TRACE_FUN(ft_t_flow);
TRACE(ft_t_flow, "called with count: %ld", (unsigned long)req_len);
- if (!test_bit(0,&busy_flag) || minor(ino->i_rdev) != zft_unit || ft_failure) {
+ if (!test_bit(0,&busy_flag) || iminor(ino) != zft_unit || ft_failure) {
TRACE_ABORT(-EIO, ft_t_err,
"failed: not busy, failure or wrong unit");
}
diff -puN drivers/char/ip2main.c~large-dev_t-10 drivers/char/ip2main.c
--- 25/drivers/char/ip2main.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/ip2main.c 2003-08-26 18:29:24.000000000 -0700
@@ -2733,7 +2733,7 @@ static
ssize_t
ip2_ipl_read(struct file *pFile, char *pData, size_t count, loff_t *off )
{
- unsigned int minor = minor( pFile->f_dentry->d_inode->i_rdev );
+ unsigned int minor = iminor(pFile->f_dentry->d_inode);
int rc = 0;
#ifdef IP2DEBUG_IPL
@@ -2863,7 +2863,7 @@ ip2_ipl_write(struct file *pFile, const
static int
ip2_ipl_ioctl ( struct inode *pInode, struct file *pFile, UINT cmd, ULONG arg )
{
- unsigned int iplminor = minor(pInode->i_rdev);
+ unsigned int iplminor = iminor(pInode);
int rc = 0;
ULONG *pIndex = (ULONG*)arg;
i2eBordStrPtr pB = i2BoardPtrTable[iplminor / 4];
@@ -2998,7 +2998,7 @@ ip2_ipl_ioctl ( struct inode *pInode, st
static int
ip2_ipl_open( struct inode *pInode, struct file *pFile )
{
- unsigned int iplminor = minor(pInode->i_rdev);
+ unsigned int iplminor = iminor(pInode);
i2eBordStrPtr pB;
i2ChanStrPtr pCh;
diff -puN drivers/char/ipmi/ipmi_devintf.c~large-dev_t-10 drivers/char/ipmi/ipmi_devintf.c
--- 25/drivers/char/ipmi/ipmi_devintf.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/ipmi/ipmi_devintf.c 2003-08-26 18:29:24.000000000 -0700
@@ -110,7 +110,7 @@ static struct ipmi_user_hndl ipmi_hndlrs
static int ipmi_open(struct inode *inode, struct file *file)
{
- int if_num = minor(inode->i_rdev);
+ int if_num = iminor(inode);
int rv;
struct ipmi_file_private *priv;
diff -puN drivers/char/ipmi/ipmi_watchdog.c~large-dev_t-10 drivers/char/ipmi/ipmi_watchdog.c
--- 25/drivers/char/ipmi/ipmi_watchdog.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/ipmi/ipmi_watchdog.c 2003-08-26 18:29:24.000000000 -0700
@@ -645,7 +645,7 @@ static ssize_t ipmi_read(struct file *fi
static int ipmi_open(struct inode *ino, struct file *filep)
{
- switch (minor(ino->i_rdev))
+ switch (iminor(ino))
{
case WATCHDOG_MINOR:
if (ipmi_wdog_open)
@@ -688,7 +688,7 @@ static int ipmi_fasync(int fd, struct fi
static int ipmi_close(struct inode *ino, struct file *filep)
{
- if (minor(ino->i_rdev)==WATCHDOG_MINOR)
+ if (iminor(ino)==WATCHDOG_MINOR)
{
#ifndef CONFIG_WATCHDOG_NOWAYOUT
ipmi_watchdog_state = WDOG_TIMEOUT_NONE;
diff -puN drivers/char/istallion.c~large-dev_t-10 drivers/char/istallion.c
--- 25/drivers/char/istallion.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/istallion.c 2003-08-26 18:29:24.000000000 -0700
@@ -4805,7 +4805,7 @@ static ssize_t stli_memread(struct file
(int) fp, (int) buf, count, (int) offp);
#endif
- brdnr = minor(fp->f_dentry->d_inode->i_rdev);
+ brdnr = iminor(fp->f_dentry->d_inode);
if (brdnr >= stli_nrbrds)
return(-ENODEV);
brdp = stli_brds[brdnr];
@@ -4860,7 +4860,7 @@ static ssize_t stli_memwrite(struct file
(int) fp, (int) buf, count, (int) offp);
#endif
- brdnr = minor(fp->f_dentry->d_inode->i_rdev);
+ brdnr = iminor(fp->f_dentry->d_inode);
if (brdnr >= stli_nrbrds)
return(-ENODEV);
brdp = stli_brds[brdnr];
@@ -5201,7 +5201,7 @@ static int stli_memioctl(struct inode *i
* Now handle the board specific ioctls. These all depend on the
* minor number of the device they were called from.
*/
- brdnr = minor(ip->i_rdev);
+ brdnr = iminor(ip);
if (brdnr >= STL_MAXBRDS)
return(-ENODEV);
brdp = stli_brds[brdnr];
diff -puN drivers/char/ite_gpio.c~large-dev_t-10 drivers/char/ite_gpio.c
--- 25/drivers/char/ite_gpio.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/ite_gpio.c 2003-08-26 18:29:24.000000000 -0700
@@ -238,7 +238,7 @@ EXPORT_SYMBOL(ite_gpio_int_wait);
static int ite_gpio_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
if (minor != GPIO_MINOR)
return -ENODEV;
diff -puN drivers/char/lp.c~large-dev_t-10 drivers/char/lp.c
--- 25/drivers/char/lp.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/lp.c 2003-08-26 18:29:24.000000000 -0700
@@ -292,7 +292,7 @@ static int lp_wait_ready(int minor, int
static ssize_t lp_write(struct file * file, const char * buf,
size_t count, loff_t *ppos)
{
- unsigned int minor = minor(file->f_dentry->d_inode->i_rdev);
+ unsigned int minor = iminor(file->f_dentry->d_inode);
struct parport *port = lp_table[minor].dev->port;
char *kbuf = lp_table[minor].lp_buffer;
ssize_t retv = 0;
@@ -408,7 +408,7 @@ static ssize_t lp_write(struct file * fi
static ssize_t lp_read(struct file * file, char * buf,
size_t count, loff_t *ppos)
{
- unsigned int minor=minor(file->f_dentry->d_inode->i_rdev);
+ unsigned int minor=iminor(file->f_dentry->d_inode);
struct parport *port = lp_table[minor].dev->port;
ssize_t retval = 0;
char *kbuf = lp_table[minor].lp_buffer;
@@ -483,7 +483,7 @@ static ssize_t lp_read(struct file * fil
static int lp_open(struct inode * inode, struct file * file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
if (minor >= LP_NO)
return -ENXIO;
@@ -540,7 +540,7 @@ static int lp_open(struct inode * inode,
static int lp_release(struct inode * inode, struct file * file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
lp_claim_parport_or_block (&lp_table[minor]);
parport_negotiate (lp_table[minor].dev->port, IEEE1284_MODE_COMPAT);
@@ -555,7 +555,7 @@ static int lp_release(struct inode * ino
static int lp_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
int status;
int retval = 0;
diff -puN drivers/char/lp_old98.c~large-dev_t-10 drivers/char/lp_old98.c
--- 25/drivers/char/lp_old98.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/lp_old98.c 2003-08-26 18:29:24.000000000 -0700
@@ -219,7 +219,7 @@ static ssize_t lp_old98_write(struct fil
static int lp_old98_open(struct inode * inode, struct file * file)
{
- if (minor(inode->i_rdev) != 0)
+ if (iminor(inode) != 0)
return -ENXIO;
if (lp.flags & LP_BUSY)
diff -puN drivers/char/mem.c~large-dev_t-10 drivers/char/mem.c
--- 25/drivers/char/mem.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/mem.c 2003-08-26 18:29:24.000000000 -0700
@@ -607,7 +607,7 @@ static struct file_operations kmsg_fops
static int memory_open(struct inode * inode, struct file * filp)
{
- switch (minor(inode->i_rdev)) {
+ switch (iminor(inode)) {
case 1:
filp->f_op = &mem_fops;
break;
diff -puN drivers/char/misc.c~large-dev_t-10 drivers/char/misc.c
--- 25/drivers/char/misc.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/misc.c 2003-08-26 18:29:24.000000000 -0700
@@ -100,7 +100,7 @@ static int misc_read_proc(char *buf, cha
static int misc_open(struct inode * inode, struct file * file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct miscdevice *c;
int err = -ENODEV;
struct file_operations *old_fops, *new_fops = NULL;
diff -puN drivers/char/ppdev.c~large-dev_t-10 drivers/char/ppdev.c
--- 25/drivers/char/ppdev.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/ppdev.c 2003-08-26 18:29:24.000000000 -0700
@@ -104,7 +104,7 @@ static inline void pp_enable_irq (struct
static ssize_t pp_read (struct file * file, char * buf, size_t count,
loff_t * ppos)
{
- unsigned int minor = minor (file->f_dentry->d_inode->i_rdev);
+ unsigned int minor = iminor(file->f_dentry->d_inode);
struct pp_struct *pp = file->private_data;
char * kbuffer;
ssize_t bytes_read = 0;
@@ -187,7 +187,7 @@ static ssize_t pp_read (struct file * fi
static ssize_t pp_write (struct file * file, const char * buf, size_t count,
loff_t * ppos)
{
- unsigned int minor = minor (file->f_dentry->d_inode->i_rdev);
+ unsigned int minor = iminor(file->f_dentry->d_inode);
struct pp_struct *pp = file->private_data;
char * kbuffer;
ssize_t bytes_written = 0;
@@ -330,7 +330,7 @@ static enum ieee1284_phase init_phase (i
static int pp_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct pp_struct *pp = file->private_data;
struct parport * port;
@@ -638,7 +638,7 @@ static int pp_ioctl(struct inode *inode,
static int pp_open (struct inode * inode, struct file * file)
{
- unsigned int minor = minor (inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct pp_struct *pp;
if (minor >= PARPORT_MAX)
@@ -667,7 +667,7 @@ static int pp_open (struct inode * inode
static int pp_release (struct inode * inode, struct file * file)
{
- unsigned int minor = minor (inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct pp_struct *pp = file->private_data;
int compat_negot;
diff -puN drivers/char/raw.c~large-dev_t-10 drivers/char/raw.c
--- 25/drivers/char/raw.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/raw.c 2003-08-26 18:29:24.000000000 -0700
@@ -43,7 +43,7 @@ static struct file_operations raw_ctl_fo
*/
static int raw_open(struct inode *inode, struct file *filp)
{
- const int minor = minor(inode->i_rdev);
+ const int minor = iminor(inode);
struct block_device *bdev;
int err;
@@ -92,7 +92,7 @@ out:
*/
static int raw_release(struct inode *inode, struct file *filp)
{
- const int minor= minor(inode->i_rdev);
+ const int minor= iminor(inode);
struct block_device *bdev;
down(&raw_mutex);
diff -puN drivers/char/scx200_gpio.c~large-dev_t-10 drivers/char/scx200_gpio.c
--- 25/drivers/char/scx200_gpio.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/scx200_gpio.c 2003-08-26 18:29:24.000000000 -0700
@@ -29,7 +29,7 @@ MODULE_PARM_DESC(major, "Major device nu
static ssize_t scx200_gpio_write(struct file *file, const char *data,
size_t len, loff_t *ppos)
{
- unsigned m = minor(file->f_dentry->d_inode->i_rdev);
+ unsigned m = iminor(file->f_dentry->d_inode);
size_t i;
if (ppos != &file->f_pos)
@@ -80,7 +80,7 @@ static ssize_t scx200_gpio_write(struct
static ssize_t scx200_gpio_read(struct file *file, char *buf,
size_t len, loff_t *ppos)
{
- unsigned m = minor(file->f_dentry->d_inode->i_rdev);
+ unsigned m = iminor(file->f_dentry->d_inode);
int value;
if (ppos != &file->f_pos)
@@ -95,7 +95,7 @@ static ssize_t scx200_gpio_read(struct f
static int scx200_gpio_open(struct inode *inode, struct file *file)
{
- unsigned m = minor(inode->i_rdev);
+ unsigned m = iminor(inode);
if (m > 63)
return -EINVAL;
return 0;
diff -puN drivers/char/stallion.c~large-dev_t-10 drivers/char/stallion.c
--- 25/drivers/char/stallion.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/stallion.c 2003-08-26 18:29:24.000000000 -0700
@@ -3078,7 +3078,7 @@ static int stl_memioctl(struct inode *ip
(int) fp, cmd, (int) arg);
#endif
- brdnr = minor(ip->i_rdev);
+ brdnr = iminor(ip);
if (brdnr >= STL_MAXBRDS)
return(-ENODEV);
rc = 0;
diff -puN drivers/char/tipar.c~large-dev_t-10 drivers/char/tipar.c
--- 25/drivers/char/tipar.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/tipar.c 2003-08-26 18:29:24.000000000 -0700
@@ -248,7 +248,7 @@ probe_ti_parallel(int minor)
static int
tipar_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev) - TIPAR_MINOR;
+ unsigned int minor = iminor(inode) - TIPAR_MINOR;
if (minor > tp_count - 1)
return -ENXIO;
@@ -266,7 +266,7 @@ tipar_open(struct inode *inode, struct f
static int
tipar_close(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev) - TIPAR_MINOR;
+ unsigned int minor = iminor(inode) - TIPAR_MINOR;
if (minor > tp_count - 1)
return -ENXIO;
@@ -279,8 +279,7 @@ tipar_close(struct inode *inode, struct
static ssize_t
tipar_write(struct file *file, const char *buf, size_t count, loff_t * ppos)
{
- unsigned int minor =
- minor(file->f_dentry->d_inode->i_rdev) - TIPAR_MINOR;
+ unsigned int minor = iminor(file->f_dentry->d_inode) - TIPAR_MINOR;
ssize_t n;
parport_claim_or_block(table[minor].dev);
@@ -308,8 +307,7 @@ static ssize_t
tipar_read(struct file *file, char *buf, size_t count, loff_t * ppos)
{
int b = 0;
- unsigned int minor =
- minor(file->f_dentry->d_inode->i_rdev) - TIPAR_MINOR;
+ unsigned int minor = iminor(file->f_dentry->d_inode) - TIPAR_MINOR;
ssize_t retval = 0;
ssize_t n = 0;
diff -puN drivers/char/tpqic02.c~large-dev_t-10 drivers/char/tpqic02.c
--- 25/drivers/char/tpqic02.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/tpqic02.c 2003-08-26 18:29:24.000000000 -0700
@@ -1726,7 +1726,7 @@ static irqreturn_t qic02_tape_interrupt(
static ssize_t qic02_tape_read(struct file *filp, char *buf, size_t count, loff_t * ppos)
{
- int type = minor(filp->f_dentry->d_inode->i_rdev);
+ int type = iminor(filp->f_dentry->d_inode);
unsigned short flags = filp->f_flags;
unsigned long bytes_todo, bytes_done, total_bytes_done = 0;
int stat;
@@ -1904,7 +1904,7 @@ static ssize_t qic02_tape_read(struct fi
*/
static ssize_t qic02_tape_write(struct file *filp, const char *buf, size_t count, loff_t * ppos)
{
- int type = minor(filp->f_dentry->d_inode->i_rdev);
+ int type = iminor(filp->f_dentry->d_inode);
unsigned short flags = filp->f_flags;
unsigned long bytes_todo, bytes_done, total_bytes_done = 0;
@@ -2070,7 +2070,7 @@ static int qic02_tape_open(struct inode
static int qic02_tape_open_no_use_count(struct inode *inode,
struct file *filp)
{
- int type = minor(inode->i_rdev);
+ int type = iminor(inode);
unsigned short flags = filp->f_flags;
unsigned short dens = 0;
int s;
@@ -2265,7 +2265,7 @@ static int qic02_tape_open_no_use_count(
static int qic02_tape_release(struct inode *inode, struct file *filp)
{
- int type = minor(inode->i_rdev);
+ int type = iminor(inode);
if (TP_DIAGS(type)) {
printk("qic02_tape_release: dev=tpqic2(%d)\n", type);
diff -puN drivers/char/vc_screen.c~large-dev_t-10 drivers/char/vc_screen.c
--- 25/drivers/char/vc_screen.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/vc_screen.c 2003-08-26 18:29:24.000000000 -0700
@@ -49,7 +49,7 @@ static int
vcs_size(struct inode *inode)
{
int size;
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int currcons = minor & 127;
if (currcons == 0)
currcons = fg_console;
@@ -104,7 +104,7 @@ static ssize_t
vcs_read(struct file *file, char *buf, size_t count, loff_t *ppos)
{
struct inode *inode = file->f_dentry->d_inode;
- unsigned int currcons = minor(inode->i_rdev);
+ unsigned int currcons = iminor(inode);
long pos = *ppos;
long viewed, attr, read;
int col, maxcol;
@@ -273,7 +273,7 @@ static ssize_t
vcs_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
{
struct inode *inode = file->f_dentry->d_inode;
- unsigned int currcons = minor(inode->i_rdev);
+ unsigned int currcons = iminor(inode);
long pos = *ppos;
long viewed, attr, size, written;
char *con_buf0;
@@ -456,7 +456,7 @@ unlock_out:
static int
vcs_open(struct inode *inode, struct file *filp)
{
- unsigned int currcons = minor(inode->i_rdev) & 127;
+ unsigned int currcons = iminor(inode) & 127;
if(currcons && !vc_cons_allocated(currcons-1))
return -ENXIO;
return 0;
diff -puN drivers/char/watchdog/acquirewdt.c~large-dev_t-10 drivers/char/watchdog/acquirewdt.c
--- 25/drivers/char/watchdog/acquirewdt.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/watchdog/acquirewdt.c 2003-08-26 18:29:24.000000000 -0700
@@ -130,7 +130,7 @@ static int acq_ioctl(struct inode *inode
static int acq_open(struct inode *inode, struct file *file)
{
- if ((minor(inode->i_rdev) == WATCHDOG_MINOR)) {
+ if ((iminor(inode) == WATCHDOG_MINOR)) {
spin_lock(&acq_lock);
if(acq_is_open) {
spin_unlock(&acq_lock);
@@ -152,7 +152,7 @@ static int acq_open(struct inode *inode,
static int acq_close(struct inode *inode, struct file *file)
{
- if(minor(inode->i_rdev)==WATCHDOG_MINOR) {
+ if(iminor(inode)==WATCHDOG_MINOR) {
spin_lock(&acq_lock);
if (expect_close)
inb_p(WDT_STOP);
diff -puN drivers/char/watchdog/cpu5wdt.c~large-dev_t-10 drivers/char/watchdog/cpu5wdt.c
--- 25/drivers/char/watchdog/cpu5wdt.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/watchdog/cpu5wdt.c 2003-08-26 18:29:24.000000000 -0700
@@ -134,7 +134,7 @@ static int cpu5wdt_stop(void)
static int cpu5wdt_open(struct inode *inode, struct file *file)
{
- switch(minor(inode->i_rdev)) {
+ switch(iminor(inode)) {
case WATCHDOG_MINOR:
if ( test_and_set_bit(0, &cpu5wdt_device.inuse) )
return -EBUSY;
@@ -148,7 +148,7 @@ static int cpu5wdt_open(struct inode *in
static int cpu5wdt_release(struct inode *inode, struct file *file)
{
- if(minor(inode->i_rdev)==WATCHDOG_MINOR) {
+ if(iminor(inode)==WATCHDOG_MINOR) {
clear_bit(0, &cpu5wdt_device.inuse);
}
return 0;
diff -puN drivers/char/watchdog/ib700wdt.c~large-dev_t-10 drivers/char/watchdog/ib700wdt.c
--- 25/drivers/char/watchdog/ib700wdt.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/watchdog/ib700wdt.c 2003-08-26 18:29:24.000000000 -0700
@@ -218,7 +218,7 @@ ibwdt_ioctl(struct inode *inode, struct
static int
ibwdt_open(struct inode *inode, struct file *file)
{
- if (minor(inode->i_rdev) == WATCHDOG_MINOR) {
+ if (iminor(inode) == WATCHDOG_MINOR) {
spin_lock(&ibwdt_lock);
if (ibwdt_is_open) {
spin_unlock(&ibwdt_lock);
@@ -240,7 +240,7 @@ ibwdt_open(struct inode *inode, struct f
static int
ibwdt_close(struct inode *inode, struct file *file)
{
- if (minor(inode->i_rdev) == WATCHDOG_MINOR) {
+ if (iminor(inode) == WATCHDOG_MINOR) {
spin_lock(&ibwdt_lock);
if (expect_close)
outb_p(wd_times[wd_margin], WDT_STOP);
diff -puN drivers/char/watchdog/machzwd.c~large-dev_t-10 drivers/char/watchdog/machzwd.c
--- 25/drivers/char/watchdog/machzwd.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/watchdog/machzwd.c 2003-08-26 18:29:24.000000000 -0700
@@ -377,7 +377,7 @@ static int zf_ioctl(struct inode *inode,
static int zf_open(struct inode *inode, struct file *file)
{
- switch(minor(inode->i_rdev)){
+ switch(iminor(inode)){
case WATCHDOG_MINOR:
spin_lock(&zf_lock);
if(zf_is_open){
@@ -402,7 +402,7 @@ static int zf_open(struct inode *inode,
static int zf_close(struct inode *inode, struct file *file)
{
- if(minor(inode->i_rdev) == WATCHDOG_MINOR){
+ if(iminor(inode) == WATCHDOG_MINOR){
if(zf_expect_close){
zf_timer_off();
diff -puN drivers/char/watchdog/pcwd.c~large-dev_t-10 drivers/char/watchdog/pcwd.c
--- 25/drivers/char/watchdog/pcwd.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/watchdog/pcwd.c 2003-08-26 18:29:24.000000000 -0700
@@ -426,7 +426,7 @@ static ssize_t pcwd_write(struct file *f
static int pcwd_open(struct inode *ino, struct file *filep)
{
- switch (minor(ino->i_rdev)) {
+ switch (iminor(ino)) {
case WATCHDOG_MINOR:
if (!atomic_dec_and_test(&open_allowed) ) {
atomic_inc( &open_allowed );
@@ -457,7 +457,7 @@ static ssize_t pcwd_read(struct file *fi
/* Can't seek (pread) on this device */
if (ppos != &file->f_pos)
return -ESPIPE;
- switch(minor(file->f_dentry->d_inode->i_rdev))
+ switch(iminor(file->f_dentry->d_inode))
{
case TEMP_MINOR:
/*
@@ -477,7 +477,7 @@ static ssize_t pcwd_read(struct file *fi
static int pcwd_close(struct inode *ino, struct file *filep)
{
- if (minor(ino->i_rdev)==WATCHDOG_MINOR) {
+ if (iminor(ino)==WATCHDOG_MINOR) {
if (expect_close) {
/* Disable the board */
if (revision == PCWD_REVISION_C) {
diff -puN drivers/char/watchdog/wdt.c~large-dev_t-10 drivers/char/watchdog/wdt.c
--- 25/drivers/char/watchdog/wdt.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/watchdog/wdt.c 2003-08-26 18:29:24.000000000 -0700
@@ -290,7 +290,7 @@ static ssize_t wdt_read(struct file *fil
if (ptr != &file->f_pos)
return -ESPIPE;
- switch(minor(file->f_dentry->d_inode->i_rdev))
+ switch(iminor(file->f_dentry->d_inode))
{
case TEMP_MINOR:
c*=11;
@@ -373,7 +373,7 @@ static int wdt_ioctl(struct inode *inode
static int wdt_open(struct inode *inode, struct file *file)
{
- switch(minor(inode->i_rdev))
+ switch(iminor(inode))
{
case WATCHDOG_MINOR:
if(test_and_set_bit(0, &wdt_is_open))
@@ -413,7 +413,7 @@ static int wdt_open(struct inode *inode,
static int wdt_release(struct inode *inode, struct file *file)
{
- if(minor(inode->i_rdev)==WATCHDOG_MINOR)
+ if(iminor(inode)==WATCHDOG_MINOR)
{
if (expect_close) {
inb_p(WDT_DC); /* Disable counters */
diff -puN drivers/char/watchdog/wdt_pci.c~large-dev_t-10 drivers/char/watchdog/wdt_pci.c
--- 25/drivers/char/watchdog/wdt_pci.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/char/watchdog/wdt_pci.c 2003-08-26 18:29:24.000000000 -0700
@@ -276,7 +276,7 @@ static ssize_t wdtpci_read(struct file *
if (ptr != &file->f_pos)
return -ESPIPE;
- switch(minor(file->f_dentry->d_inode->i_rdev))
+ switch(iminor(file->f_dentry->d_inode))
{
case TEMP_MINOR:
c*=11;
@@ -361,7 +361,7 @@ static int wdtpci_open(struct inode *ino
{
unsigned long flags;
- switch(minor(inode->i_rdev))
+ switch(iminor(inode))
{
case WATCHDOG_MINOR:
if (down_trylock(&open_sem))
@@ -423,7 +423,7 @@ static int wdtpci_open(struct inode *ino
static int wdtpci_release(struct inode *inode, struct file *file)
{
- if (minor(inode->i_rdev)==WATCHDOG_MINOR) {
+ if (iminor(inode)==WATCHDOG_MINOR) {
unsigned long flags;
if (expect_close) {
spin_lock_irqsave(&wdtpci_lock, flags);
diff -puN drivers/i2c/i2c-dev.c~large-dev_t-10 drivers/i2c/i2c-dev.c
--- 25/drivers/i2c/i2c-dev.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/i2c/i2c-dev.c 2003-08-26 18:29:24.000000000 -0700
@@ -138,7 +138,7 @@ static ssize_t i2cdev_read (struct file
return -ENOMEM;
pr_debug("i2c-dev.o: i2c-%d reading %d bytes.\n",
- minor(file->f_dentry->d_inode->i_rdev), count);
+ iminor(file->f_dentry->d_inode), count);
ret = i2c_master_recv(client,tmp,count);
if (ret >= 0)
@@ -166,7 +166,7 @@ static ssize_t i2cdev_write (struct file
}
pr_debug("i2c-dev.o: i2c-%d writing %d bytes.\n",
- minor(file->f_dentry->d_inode->i_rdev), count);
+ iminor(file->f_dentry->d_inode), count);
ret = i2c_master_send(client,tmp,count);
kfree(tmp);
@@ -186,7 +186,7 @@ int i2cdev_ioctl (struct inode *inode, s
unsigned long funcs;
dev_dbg(&client->dev, "i2c-%d ioctl, cmd: 0x%x, arg: %lx.\n",
- minor(inode->i_rdev),cmd, arg);
+ iminor(inode),cmd, arg);
switch ( cmd ) {
case I2C_SLAVE:
@@ -373,7 +373,7 @@ int i2cdev_ioctl (struct inode *inode, s
static int i2cdev_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct i2c_client *client;
struct i2c_adapter *adap;
struct i2c_dev *i2c_dev;
diff -puN drivers/ide/ide-tape.c~large-dev_t-10 drivers/ide/ide-tape.c
--- 25/drivers/ide/ide-tape.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/ide/ide-tape.c 2003-08-26 18:29:24.000000000 -0700
@@ -4922,7 +4922,7 @@ static ssize_t idetape_chrdev_write (str
struct inode *inode = file->f_dentry->d_inode;
ide_drive_t *drive = file->private_data;
idetape_tape_t *tape = drive->driver_data;
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
ssize_t retval, actually_written = 0;
int position;
@@ -5568,7 +5568,7 @@ ok:
*/
static int idetape_chrdev_open (struct inode *inode, struct file *filp)
{
- unsigned int minor = minor(inode->i_rdev), i = minor & ~0xc0;
+ unsigned int minor = iminor(inode), i = minor & ~0xc0;
ide_drive_t *drive;
idetape_tape_t *tape;
idetape_pc_t pc;
@@ -5649,7 +5649,7 @@ static int idetape_chrdev_release (struc
ide_drive_t *drive = filp->private_data;
idetape_tape_t *tape;
idetape_pc_t pc;
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
lock_kernel();
tape = drive->driver_data;
diff -puN drivers/ieee1394/ieee1394_core.c~large-dev_t-10 drivers/ieee1394/ieee1394_core.c
--- 25/drivers/ieee1394/ieee1394_core.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/ieee1394/ieee1394_core.c 2003-08-26 18:29:24.000000000 -0700
@@ -1124,7 +1124,7 @@ static int ieee1394_dispatch_open(struct
to get the index of the ieee1394_driver
we want */
- blocknum = (minor(inode->i_rdev) >> 4) & 0xF;
+ blocknum = (iminor(inode) >> 4) & 0xF;
/* look up the driver */
diff -puN drivers/ieee1394/ieee1394_core.h~large-dev_t-10 drivers/ieee1394/ieee1394_core.h
--- 25/drivers/ieee1394/ieee1394_core.h~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/ieee1394/ieee1394_core.h 2003-08-26 18:29:24.000000000 -0700
@@ -202,7 +202,7 @@ void hpsb_packet_received(struct hpsb_ho
/* return the index (within a minor number block) of a file */
static inline unsigned char ieee1394_file_to_instance(struct file *file)
{
- unsigned char minor = minor(file->f_dentry->d_inode->i_rdev);
+ unsigned char minor = iminor(file->f_dentry->d_inode);
/* return lower 4 bits */
return minor & 0xF;
diff -puN drivers/ieee1394/pcilynx.c~large-dev_t-10 drivers/ieee1394/pcilynx.c
--- 25/drivers/ieee1394/pcilynx.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/ieee1394/pcilynx.c 2003-08-26 18:29:24.000000000 -0700
@@ -875,7 +875,7 @@ static void aux_setup_pcls(struct ti_lyn
static int mem_open(struct inode *inode, struct file *file)
{
- int cid = minor(inode->i_rdev);
+ int cid = iminor(inode);
enum { t_rom, t_aux, t_ram } type;
struct memdata *md;
diff -puN drivers/input/evdev.c~large-dev_t-10 drivers/input/evdev.c
--- 25/drivers/input/evdev.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/input/evdev.c 2003-08-26 18:29:24.000000000 -0700
@@ -122,7 +122,7 @@ static int evdev_release(struct inode *
static int evdev_open(struct inode * inode, struct file * file)
{
struct evdev_list *list;
- int i = minor(inode->i_rdev) - EVDEV_MINOR_BASE;
+ int i = iminor(inode) - EVDEV_MINOR_BASE;
int accept_err;
if (i >= EVDEV_MINORS || !evdev_table[i])
diff -puN drivers/input/input.c~large-dev_t-10 drivers/input/input.c
--- 25/drivers/input/input.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/input/input.c 2003-08-26 18:29:24.000000000 -0700
@@ -527,7 +527,7 @@ void input_unregister_handler(struct inp
static int input_open_file(struct inode *inode, struct file *file)
{
- struct input_handler *handler = input_table[minor(inode->i_rdev) >> 5];
+ struct input_handler *handler = input_table[iminor(inode) >> 5];
struct file_operations *old_fops, *new_fops = NULL;
int err;
diff -puN drivers/input/joydev.c~large-dev_t-10 drivers/input/joydev.c
--- 25/drivers/input/joydev.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/input/joydev.c 2003-08-26 18:29:24.000000000 -0700
@@ -170,7 +170,7 @@ static int joydev_release(struct inode *
static int joydev_open(struct inode *inode, struct file *file)
{
struct joydev_list *list;
- int i = minor(inode->i_rdev) - JOYDEV_MINOR_BASE;
+ int i = iminor(inode) - JOYDEV_MINOR_BASE;
if (i >= JOYDEV_MINORS || !joydev_table[i])
return -ENODEV;
diff -puN drivers/input/mousedev.c~large-dev_t-10 drivers/input/mousedev.c
--- 25/drivers/input/mousedev.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/input/mousedev.c 2003-08-26 18:29:24.000000000 -0700
@@ -232,7 +232,7 @@ static int mousedev_open(struct inode *
i = MOUSEDEV_MIX;
else
#endif
- i = minor(inode->i_rdev) - MOUSEDEV_MINOR_BASE;
+ i = iminor(inode) - MOUSEDEV_MINOR_BASE;
if (i >= MOUSEDEV_MINORS || !mousedev_table[i])
return -ENODEV;
diff -puN drivers/input/tsdev.c~large-dev_t-10 drivers/input/tsdev.c
--- 25/drivers/input/tsdev.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/input/tsdev.c 2003-08-26 18:29:24.000000000 -0700
@@ -96,7 +96,7 @@ static int tsdev_fasync(int fd, struct f
static int tsdev_open(struct inode *inode, struct file *file)
{
- int i = minor(inode->i_rdev) - TSDEV_MINOR_BASE;
+ int i = iminor(inode) - TSDEV_MINOR_BASE;
struct tsdev_list *list;
if (i >= TSDEV_MINORS || !tsdev_table[i])
diff -puN drivers/isdn/capi/capi.c~large-dev_t-10 drivers/isdn/capi/capi.c
--- 25/drivers/isdn/capi/capi.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/isdn/capi/capi.c 2003-08-26 18:29:24.000000000 -0700
@@ -964,7 +964,7 @@ static int capinc_tty_open(struct tty_st
{
struct capiminor *mp;
- if ((mp = capiminor_find(minor(file->f_dentry->d_inode->i_rdev))) == 0)
+ if ((mp = capiminor_find(iminor(file->f_dentry->d_inode))) == 0)
return -ENXIO;
if (mp->nccip == 0)
return -ENXIO;
diff -puN drivers/isdn/hardware/eicon/divasi.c~large-dev_t-10 drivers/isdn/hardware/eicon/divasi.c
--- 25/drivers/isdn/hardware/eicon/divasi.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/isdn/hardware/eicon/divasi.c 2003-08-26 18:29:24.000000000 -0700
@@ -432,7 +432,7 @@ static int um_idi_open(struct inode *ino
static int um_idi_release(struct inode *inode, struct file *file)
{
- unsigned int adapter_nr = minor(inode->i_rdev);
+ unsigned int adapter_nr = iminor(inode);
int ret = 0;
if (!(file->private_data)) {
diff -puN drivers/isdn/i4l/isdn_common.c~large-dev_t-10 drivers/isdn/i4l/isdn_common.c
--- 25/drivers/isdn/i4l/isdn_common.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/isdn/i4l/isdn_common.c 2003-08-26 18:29:24.000000000 -0700
@@ -1432,7 +1432,7 @@ static struct file_operations isdn_statu
static int
isdn_ctrl_open(struct inode *ino, struct file *file)
{
- unsigned int minor = minor(ino->i_rdev);
+ unsigned int minor = iminor(ino);
struct isdn_slot *slot = get_slot_by_minor(minor - ISDN_MINOR_CTRL);
if (!slot)
@@ -1795,7 +1795,7 @@ static struct file_operations isdn_ctrl_
static int
isdn_open(struct inode * inode, struct file * file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int err = -ENODEV;
struct file_operations *old_fops, *new_fops = NULL;
diff -puN drivers/isdn/i4l/isdn_ppp.c~large-dev_t-10 drivers/isdn/i4l/isdn_ppp.c
--- 25/drivers/isdn/i4l/isdn_ppp.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/isdn/i4l/isdn_ppp.c 2003-08-26 18:29:24.000000000 -0700
@@ -119,7 +119,7 @@ static int
ipppd_open(struct inode *ino, struct file *file)
{
unsigned long flags;
- unsigned int minor = minor(ino->i_rdev) - ISDN_MINOR_PPP;
+ unsigned int minor = iminor(ino) - ISDN_MINOR_PPP;
struct ipppd *ipppd;
ipppd = kmalloc(sizeof(*ipppd), GFP_KERNEL);
diff -puN drivers/macintosh/adb.c~large-dev_t-10 drivers/macintosh/adb.c
--- 25/drivers/macintosh/adb.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/macintosh/adb.c 2003-08-26 18:29:24.000000000 -0700
@@ -712,7 +712,7 @@ static int adb_open(struct inode *inode,
{
struct adbdev_state *state;
- if (minor(inode->i_rdev) > 0 || adb_controller == NULL)
+ if (iminor(inode) > 0 || adb_controller == NULL)
return -ENXIO;
state = kmalloc(sizeof(struct adbdev_state), GFP_KERNEL);
if (state == 0)
diff -puN drivers/md/md.c~large-dev_t-10 drivers/md/md.c
--- 25/drivers/md/md.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/md/md.c 2003-08-26 18:29:24.000000000 -0700
@@ -2366,17 +2366,14 @@ static int md_ioctl(struct inode *inode,
unsigned int cmd, unsigned long arg)
{
char b[BDEVNAME_SIZE];
- unsigned int minor;
+ unsigned int minor = iminor(inode);
int err = 0;
struct hd_geometry *loc = (struct hd_geometry *) arg;
mddev_t *mddev = NULL;
- kdev_t dev;
if (!capable(CAP_SYS_ADMIN))
return -EACCES;
- dev = inode->i_rdev;
- minor = minor(dev);
if (minor >= MAX_MD_DEVS) {
MD_BUG();
return -EINVAL;
@@ -2615,7 +2612,7 @@ static int md_open(struct inode *inode,
/*
* Succeed if we can find or allocate a mddev structure.
*/
- mddev_t *mddev = mddev_find(minor(inode->i_rdev));
+ mddev_t *mddev = mddev_find(iminor(inode));
int err = -ENOMEM;
if (!mddev)
diff -puN drivers/media/common/saa7146_fops.c~large-dev_t-10 drivers/media/common/saa7146_fops.c
--- 25/drivers/media/common/saa7146_fops.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/media/common/saa7146_fops.c 2003-08-26 18:29:24.000000000 -0700
@@ -157,7 +157,7 @@ void saa7146_buffer_timeout(unsigned lon
static int fops_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct saa7146_dev *h = NULL, *dev = NULL;
struct list_head *list;
struct saa7146_fh *fh = NULL;
diff -puN drivers/media/dvb/dvb-core/dvbdev.c~large-dev_t-10 drivers/media/dvb/dvb-core/dvbdev.c
--- 25/drivers/media/dvb/dvb-core/dvbdev.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/media/dvb/dvb-core/dvbdev.c 2003-08-26 18:29:24.000000000 -0700
@@ -73,7 +73,7 @@ static int dvb_device_open(struct inode
{
struct dvb_device *dvbdev;
- dvbdev = dvbdev_find_device (minor(inode->i_rdev));
+ dvbdev = dvbdev_find_device (iminor(inode));
if (dvbdev && dvbdev->fops) {
int err = 0;
diff -puN drivers/media/video/bttv-driver.c~large-dev_t-10 drivers/media/video/bttv-driver.c
--- 25/drivers/media/video/bttv-driver.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/media/video/bttv-driver.c 2003-08-26 18:29:24.000000000 -0700
@@ -2758,7 +2758,7 @@ static unsigned int bttv_poll(struct fil
static int bttv_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct bttv *btv = NULL;
struct bttv_fh *fh;
enum v4l2_buf_type type = 0;
@@ -2894,7 +2894,7 @@ struct video_device bttv_vbi_template =
static int radio_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct bttv *btv = NULL;
u32 v = 400*16;
unsigned int i;
diff -puN drivers/media/video/saa7134/saa7134-oss.c~large-dev_t-10 drivers/media/video/saa7134/saa7134-oss.c
--- 25/drivers/media/video/saa7134/saa7134-oss.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/media/video/saa7134/saa7134-oss.c 2003-08-26 18:29:24.000000000 -0700
@@ -215,7 +215,7 @@ static int dsp_rec_stop(struct saa7134_d
static int dsp_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct saa7134_dev *h,*dev = NULL;
struct list_head *list;
int err;
@@ -598,7 +598,7 @@ mixer_level(struct saa7134_dev *dev, enu
static int mixer_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct saa7134_dev *h,*dev = NULL;
struct list_head *list;
diff -puN drivers/media/video/saa7134/saa7134-ts.c~large-dev_t-10 drivers/media/video/saa7134/saa7134-ts.c
--- 25/drivers/media/video/saa7134/saa7134-ts.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/media/video/saa7134/saa7134-ts.c 2003-08-26 18:29:24.000000000 -0700
@@ -166,7 +166,7 @@ static struct videobuf_queue_ops ts_qops
static int ts_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct saa7134_dev *h,*dev = NULL;
struct list_head *list;
int err;
diff -puN drivers/media/video/saa7134/saa7134-video.c~large-dev_t-10 drivers/media/video/saa7134/saa7134-video.c
--- 25/drivers/media/video/saa7134/saa7134-video.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/media/video/saa7134/saa7134-video.c 2003-08-26 18:29:24.000000000 -0700
@@ -1131,7 +1131,7 @@ static int saa7134_resource(struct saa71
static int video_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct saa7134_dev *h,*dev = NULL;
struct saa7134_fh *fh;
struct list_head *list;
diff -puN drivers/media/video/stradis.c~large-dev_t-10 drivers/media/video/stradis.c
--- 25/drivers/media/video/stradis.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/media/video/stradis.c 2003-08-26 18:29:24.000000000 -0700
@@ -1946,7 +1946,7 @@ static ssize_t saa_write(struct file *fi
static int saa_open(struct inode *inode, struct file *file)
{
struct saa7146 *saa = NULL;
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
int i;
for (i = 0; i < SAA7146_MAX; i++) {
diff -puN drivers/media/video/tvmixer.c~large-dev_t-10 drivers/media/video/tvmixer.c
--- 25/drivers/media/video/tvmixer.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/media/video/tvmixer.c 2003-08-26 18:29:24.000000000 -0700
@@ -173,7 +173,7 @@ static int tvmixer_ioctl(struct inode *i
static int tvmixer_open(struct inode *inode, struct file *file)
{
- int i, minor = minor(inode->i_rdev);
+ int i, minor = iminor(inode);
struct TVMIXER *mix = NULL;
struct i2c_client *client = NULL;
diff -puN drivers/media/video/videodev.c~large-dev_t-10 drivers/media/video/videodev.c
--- 25/drivers/media/video/videodev.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/media/video/videodev.c 2003-08-26 18:29:24.000000000 -0700
@@ -99,7 +99,7 @@ static DECLARE_MUTEX(videodev_lock);
struct video_device* video_devdata(struct file *file)
{
- return video_device[minor(file->f_dentry->d_inode->i_rdev)];
+ return video_device[iminor(file->f_dentry->d_inode)];
}
/*
@@ -107,7 +107,7 @@ struct video_device* video_devdata(struc
*/
static int video_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
int err = 0;
struct video_device *vfl;
struct file_operations *old_fops;
diff -puN drivers/mtd/mtdchar.c~large-dev_t-10 drivers/mtd/mtdchar.c
--- 25/drivers/mtd/mtdchar.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/mtd/mtdchar.c 2003-08-26 18:29:24.000000000 -0700
@@ -59,7 +59,7 @@ static loff_t mtd_lseek (struct file *fi
static int mtd_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int devnum = minor >> 1;
struct mtd_info *mtd;
diff -puN drivers/net/wan/cosa.c~large-dev_t-10 drivers/net/wan/cosa.c
--- 25/drivers/net/wan/cosa.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/net/wan/cosa.c 2003-08-26 18:29:24.000000000 -0700
@@ -961,12 +961,12 @@ static int cosa_open(struct inode *inode
unsigned long flags;
int n;
- if ((n=minor(file->f_dentry->d_inode->i_rdev)>>CARD_MINOR_BITS)
+ if ((n=iminor(file->f_dentry->d_inode)>>CARD_MINOR_BITS)
>= nr_cards)
return -ENODEV;
cosa = cosa_cards+n;
- if ((n=minor(file->f_dentry->d_inode->i_rdev)
+ if ((n=iminor(file->f_dentry->d_inode)
& ((1<<CARD_MINOR_BITS)-1)) >= cosa->nchannels)
return -ENODEV;
chan = cosa->chan + n;
@@ -1009,7 +1009,7 @@ static struct fasync_struct *fasync[256]
/* To be done ... */
static int cosa_fasync(struct inode *inode, struct file *file, int on)
{
- int port = MINOR(inode->i_rdev);
+ int port = iminor(inode);
int rv = fasync_helper(inode, file, on, &fasync[port]);
return rv < 0 ? rv : 0;
}
diff -puN drivers/pcmcia/ds.c~large-dev_t-10 drivers/pcmcia/ds.c
--- 25/drivers/pcmcia/ds.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/pcmcia/ds.c 2003-08-26 18:29:24.000000000 -0700
@@ -495,7 +495,7 @@ static int unbind_request(struct pcmcia_
static int ds_open(struct inode *inode, struct file *file)
{
- socket_t i = minor(inode->i_rdev);
+ socket_t i = iminor(inode);
struct pcmcia_bus_socket *s;
user_info_t *user;
@@ -529,7 +529,7 @@ static int ds_open(struct inode *inode,
static int ds_release(struct inode *inode, struct file *file)
{
- socket_t i = minor(inode->i_rdev);
+ socket_t i = iminor(inode);
struct pcmcia_bus_socket *s;
user_info_t *user, **link;
@@ -563,7 +563,7 @@ out:
static ssize_t ds_read(struct file *file, char *buf,
size_t count, loff_t *ppos)
{
- socket_t i = minor(file->f_dentry->d_inode->i_rdev);
+ socket_t i = iminor(file->f_dentry->d_inode);
struct pcmcia_bus_socket *s;
user_info_t *user;
@@ -594,7 +594,7 @@ static ssize_t ds_read(struct file *file
static ssize_t ds_write(struct file *file, const char *buf,
size_t count, loff_t *ppos)
{
- socket_t i = minor(file->f_dentry->d_inode->i_rdev);
+ socket_t i = iminor(file->f_dentry->d_inode);
struct pcmcia_bus_socket *s;
user_info_t *user;
@@ -629,7 +629,7 @@ static ssize_t ds_write(struct file *fil
/* No kernel lock - fine */
static u_int ds_poll(struct file *file, poll_table *wait)
{
- socket_t i = minor(file->f_dentry->d_inode->i_rdev);
+ socket_t i = iminor(file->f_dentry->d_inode);
struct pcmcia_bus_socket *s;
user_info_t *user;
@@ -653,7 +653,7 @@ static u_int ds_poll(struct file *file,
static int ds_ioctl(struct inode * inode, struct file * file,
u_int cmd, u_long arg)
{
- socket_t i = minor(inode->i_rdev);
+ socket_t i = iminor(inode);
struct pcmcia_bus_socket *s;
u_int size;
int ret, err;
diff -puN drivers/s390/char/tape_char.c~large-dev_t-10 drivers/s390/char/tape_char.c
--- 25/drivers/s390/char/tape_char.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/s390/char/tape_char.c 2003-08-26 18:29:24.000000000 -0700
@@ -240,12 +240,12 @@ tapechar_open (struct inode *inode, stru
if (major(filp->f_dentry->d_inode->i_rdev) != tapechar_major)
return -ENODEV;
- minor = minor(filp->f_dentry->d_inode->i_rdev);
+ minor = iminor(filp->f_dentry->d_inode);
device = tape_get_device(minor / TAPE_MINORS_PER_DEV);
if (IS_ERR(device)) {
return PTR_ERR(device);
}
- DBF_EVENT(6, "TCHAR:open: %x\n", minor(inode->i_rdev));
+ DBF_EVENT(6, "TCHAR:open: %x\n", iminor(inode));
rc = tape_open(device);
if (rc == 0) {
rc = tape_assign(device);
@@ -269,7 +269,7 @@ tapechar_release(struct inode *inode, st
struct tape_device *device;
device = (struct tape_device *) filp->private_data;
- DBF_EVENT(6, "TCHAR:release: %x\n", minor(inode->i_rdev));
+ DBF_EVENT(6, "TCHAR:release: %x\n", iminor(inode));
#if 0
// FIXME: this is broken. Either MTWEOF/MTWEOF/MTBSR is done
// EVERYTIME the user switches from write to something different
@@ -281,7 +281,7 @@ tapechar_release(struct inode *inode, st
/*
* If this is the rewinding tape minor then rewind.
*/
- if ((minor(inode->i_rdev) & 1) != 0)
+ if ((iminor(inode) & 1) != 0)
tape_mtop(device, MTREW, 1);
if (device->char_data.idal_buf != NULL) {
idal_buffer_free(device->char_data.idal_buf);
diff -puN drivers/s390/char/tubio.h~large-dev_t-10 drivers/s390/char/tubio.h
--- 25/drivers/s390/char/tubio.h~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/s390/char/tubio.h 2003-08-26 18:29:24.000000000 -0700
@@ -377,7 +377,7 @@ extern tub_t *tubfindbyirq(int);
*/
extern inline tub_t *INODE2TUB(struct inode *ip)
{
- unsigned int minor = minor(ip->i_rdev);
+ unsigned int minor = iminor(ip);
tub_t *tubp = NULL;
if (minor == 0 && current->tty) {
if (current->tty->driver == tty3270_driver)
diff -puN drivers/sbus/char/bpp.c~large-dev_t-10 drivers/sbus/char/bpp.c
--- 25/drivers/sbus/char/bpp.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/sbus/char/bpp.c 2003-08-26 18:29:24.000000000 -0700
@@ -440,7 +440,7 @@ static spinlock_t bpp_open_lock = SPIN_L
*/
static int bpp_open(struct inode *inode, struct file *f)
{
- unsigned minor = minor(inode->i_rdev);
+ unsigned minor = iminor(inode);
int ret;
spin_lock(&bpp_open_lock);
@@ -470,7 +470,7 @@ static int bpp_open(struct inode *inode,
*/
static int bpp_release(struct inode *inode, struct file *f)
{
- unsigned minor = minor(inode->i_rdev);
+ unsigned minor = iminor(inode);
spin_lock(&bpp_open_lock);
instances[minor].opened = 0;
@@ -634,7 +634,7 @@ static long read_ecp(unsigned minor, cha
static ssize_t bpp_read(struct file *f, char *c, size_t cnt, loff_t * ppos)
{
long rc;
- const unsigned minor = minor(f->f_dentry->d_inode->i_rdev);
+ unsigned minor = iminor(f->f_dentry->d_inode);
if (minor >= BPP_NO) return -ENODEV;
if (!instances[minor].present) return -ENODEV;
@@ -787,7 +787,7 @@ static long write_ecp(unsigned minor, co
static ssize_t bpp_write(struct file *f, const char *c, size_t cnt, loff_t * ppos)
{
long errno = 0;
- const unsigned minor = minor(f->f_dentry->d_inode->i_rdev);
+ unsigned minor = iminor(f->f_dentry->d_inode);
if (minor >= BPP_NO) return -ENODEV;
if (!instances[minor].present) return -ENODEV;
@@ -813,7 +813,7 @@ static int bpp_ioctl(struct inode *inode
{
int errno = 0;
- unsigned minor = minor(inode->i_rdev);
+ unsigned minor = iminor(inode);
if (minor >= BPP_NO) return -ENODEV;
if (!instances[minor].present) return -ENODEV;
diff -puN drivers/sbus/char/cpwatchdog.c~large-dev_t-10 drivers/sbus/char/cpwatchdog.c
--- 25/drivers/sbus/char/cpwatchdog.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/sbus/char/cpwatchdog.c 2003-08-26 18:29:24.000000000 -0700
@@ -295,7 +295,7 @@ static inline int wd_opt_timeout(void)
static int wd_open(struct inode *inode, struct file *f)
{
- switch(minor(inode->i_rdev))
+ switch(iminor(inode))
{
case WD0_MINOR:
f->private_data = &wd_dev.watchdog[WD0_ID];
diff -puN drivers/sbus/char/display7seg.c~large-dev_t-10 drivers/sbus/char/display7seg.c
--- 25/drivers/sbus/char/display7seg.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/sbus/char/display7seg.c 2003-08-26 18:29:24.000000000 -0700
@@ -91,7 +91,7 @@ static atomic_t d7s_users = ATOMIC_INIT(
static int d7s_open(struct inode *inode, struct file *f)
{
- if (D7S_MINOR != minor(inode->i_rdev))
+ if (D7S_MINOR != iminor(inode))
return -ENODEV;
atomic_inc(&d7s_users);
return 0;
@@ -121,7 +121,7 @@ static int d7s_ioctl(struct inode *inode
__u8 regs = readb(d7s_regs);
__u8 ireg = 0;
- if (D7S_MINOR != minor(inode->i_rdev))
+ if (D7S_MINOR != iminor(inode))
return -ENODEV;
switch (cmd) {
diff -puN drivers/sbus/char/vfc_dev.c~large-dev_t-10 drivers/sbus/char/vfc_dev.c
--- 25/drivers/sbus/char/vfc_dev.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/sbus/char/vfc_dev.c 2003-08-26 18:29:24.000000000 -0700
@@ -184,7 +184,7 @@ static int vfc_open(struct inode *inode,
struct vfc_dev *dev;
spin_lock(&vfc_dev_lock);
- dev = vfc_get_dev_ptr(MINOR(inode->i_rdev));
+ dev = vfc_get_dev_ptr(iminor(inode));
if (dev == NULL) {
spin_unlock(&vfc_dev_lock);
return -ENODEV;
@@ -215,7 +215,7 @@ static int vfc_release(struct inode *ino
struct vfc_dev *dev;
spin_lock(&vfc_dev_lock);
- dev = vfc_get_dev_ptr(MINOR(inode->i_rdev));
+ dev = vfc_get_dev_ptr(iminor(inode));
if (!dev || !dev->busy) {
spin_unlock(&vfc_dev_lock);
return -EINVAL;
@@ -557,7 +557,7 @@ static int vfc_ioctl(struct inode *inode
unsigned int tmp;
struct vfc_dev *dev;
- dev = vfc_get_dev_ptr(MINOR(inode->i_rdev));
+ dev = vfc_get_dev_ptr(iminor(inode));
if(dev == NULL)
return -ENODEV;
@@ -602,7 +602,7 @@ static int vfc_ioctl(struct inode *inode
VFC_IOCTL_DEBUG_PRINTK(("vfc%d: IOCTL(VFCRDINFO)\n", dev->instance));
break;
default:
- ret = vfc_debug(vfc_get_dev_ptr(MINOR(inode->i_rdev)),
+ ret = vfc_debug(vfc_get_dev_ptr(iminor(inode)),
cmd, arg);
break;
};
@@ -616,7 +616,7 @@ static int vfc_mmap(struct inode *inode,
unsigned int map_size, ret, map_offset;
struct vfc_dev *dev;
- dev = vfc_get_dev_ptr(MINOR(inode->i_rdev));
+ dev = vfc_get_dev_ptr(iminor(inode));
if(dev == NULL)
return -ENODEV;
diff -puN drivers/scsi/3w-xxxx.c~large-dev_t-10 drivers/scsi/3w-xxxx.c
--- 25/drivers/scsi/3w-xxxx.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/scsi/3w-xxxx.c 2003-08-26 18:29:24.000000000 -0700
@@ -628,7 +628,7 @@ static int tw_chrdev_ioctl(struct inode
unsigned long *cpu_addr;
TW_New_Ioctl *tw_ioctl;
TW_Passthru *passthru;
- TW_Device_Extension *tw_dev = tw_device_extension_list[minor(inode->i_rdev)];
+ TW_Device_Extension *tw_dev = tw_device_extension_list[iminor(inode)];
int retval = -EFAULT;
dprintk(KERN_WARNING "3w-xxxx: tw_chrdev_ioctl()\n");
@@ -786,7 +786,7 @@ static int tw_chrdev_open(struct inode *
dprintk(KERN_WARNING "3w-xxxx: tw_ioctl_open()\n");
- minor_number = minor(inode->i_rdev);
+ minor_number = iminor(inode);
if (minor_number >= tw_device_extension_count)
return -ENODEV;
diff -puN drivers/scsi/aacraid/linit.c~large-dev_t-10 drivers/scsi/aacraid/linit.c
--- 25/drivers/scsi/aacraid/linit.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/scsi/aacraid/linit.c 2003-08-26 18:29:24.000000000 -0700
@@ -565,7 +565,7 @@ static int aac_ioctl(Scsi_Device * scsi_
static int aac_cfg_open(struct inode * inode, struct file * file )
{
- unsigned minor_number = minor(inode->i_rdev);
+ unsigned minor_number = iminor(inode);
if(minor_number >= aac_count)
return -ENODEV;
return 0;
@@ -601,7 +601,7 @@ static int aac_cfg_release(struct inode
static int aac_cfg_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg )
{
- struct aac_dev *dev = aac_devices[minor(inode->i_rdev)];
+ struct aac_dev *dev = aac_devices[iminor(inode)];
return aac_do_ioctl(dev, cmd, (void *)arg);
}
diff -puN drivers/scsi/dpt_i2o.c~large-dev_t-10 drivers/scsi/dpt_i2o.c
--- 25/drivers/scsi/dpt_i2o.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/scsi/dpt_i2o.c 2003-08-26 18:29:24.000000000 -0700
@@ -1551,7 +1551,7 @@ static int adpt_open(struct inode *inode
//TODO check for root access
//
- minor = minor(inode->i_rdev);
+ minor = iminor(inode);
if (minor >= hba_count) {
return -ENXIO;
}
@@ -1582,7 +1582,7 @@ static int adpt_close(struct inode *inod
int minor;
adpt_hba* pHba;
- minor = minor(inode->i_rdev);
+ minor = iminor(inode);
if (minor >= hba_count) {
return -ENXIO;
}
@@ -1878,7 +1878,7 @@ static int adpt_ioctl(struct inode *inod
adpt_hba* pHba;
ulong flags;
- minor = minor(inode->i_rdev);
+ minor = iminor(inode);
if (minor >= DPTI_MAX_HBA){
return -ENXIO;
}
diff -puN drivers/scsi/osst.c~large-dev_t-10 drivers/scsi/osst.c
--- 25/drivers/scsi/osst.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/scsi/osst.c 2003-08-26 18:29:24.000000000 -0700
@@ -132,9 +132,9 @@ static int debugging = 1;
#define OSST_TIMEOUT (200 * HZ)
#define OSST_LONG_TIMEOUT (1800 * HZ)
-#define TAPE_NR(x) (minor(x) & ~(-1 << ST_MODE_SHIFT))
-#define TAPE_MODE(x) ((minor(x) & ST_MODE_MASK) >> ST_MODE_SHIFT)
-#define TAPE_REWIND(x) ((minor(x) & 0x80) == 0)
+#define TAPE_NR(x) (iminor(x) & ~(-1 << ST_MODE_SHIFT))
+#define TAPE_MODE(x) ((iminor(x) & ST_MODE_MASK) >> ST_MODE_SHIFT)
+#define TAPE_REWIND(x) ((iminor(x) & 0x80) == 0)
#define TAPE_IS_RAW(x) (TAPE_MODE(x) & (ST_NBR_MODES >> 1))
/* Internal ioctl to set both density (uppermost 8 bits) and blocksize (lower
@@ -4215,8 +4215,8 @@ static int os_scsi_tape_open(struct inod
ST_mode * STm;
ST_partstat * STps;
char * name;
- int dev = TAPE_NR(inode->i_rdev);
- int mode = TAPE_MODE(inode->i_rdev);
+ int dev = TAPE_NR(inode);
+ int mode = TAPE_MODE(inode);
write_lock(&os_scsi_tapes_lock);
if (dev >= osst_max_dev || os_scsi_tapes == NULL ||
@@ -4244,7 +4244,7 @@ static int os_scsi_tape_open(struct inod
filp->private_data = STp;
STp->in_use = 1;
write_unlock(&os_scsi_tapes_lock);
- STp->rew_at_close = TAPE_REWIND(inode->i_rdev);
+ STp->rew_at_close = TAPE_REWIND(inode);
if( !scsi_block_when_processing_errors(STp->device) ) {
return -ENXIO;
@@ -4264,7 +4264,7 @@ static int os_scsi_tape_open(struct inod
flags = filp->f_flags;
STp->write_prot = ((flags & O_ACCMODE) == O_RDONLY);
- STp->raw = TAPE_IS_RAW(inode->i_rdev);
+ STp->raw = TAPE_IS_RAW(inode);
if (STp->raw)
STp->header_ok = 0;
diff -puN drivers/scsi/sg.c~large-dev_t-10 drivers/scsi/sg.c
--- 25/drivers/scsi/sg.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/scsi/sg.c 2003-08-26 18:29:24.000000000 -0700
@@ -238,7 +238,7 @@ static int sg_nr_dev;
static int
sg_open(struct inode *inode, struct file *filp)
{
- int dev = minor(inode->i_rdev);
+ int dev = iminor(inode);
int flags = filp->f_flags;
Sg_device *sdp;
Sg_fd *sfp;
diff -puN drivers/scsi/st.c~large-dev_t-10 drivers/scsi/st.c
--- 25/drivers/scsi/st.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/scsi/st.c 2003-08-26 18:29:24.000000000 -0700
@@ -140,8 +140,8 @@ DEB( static int debugging = DEBUG; )
#define ST_TIMEOUT (900 * HZ)
#define ST_LONG_TIMEOUT (14000 * HZ)
-#define TAPE_NR(x) (minor(x) & ~(-1 << ST_MODE_SHIFT))
-#define TAPE_MODE(x) ((minor(x) & ST_MODE_MASK) >> ST_MODE_SHIFT)
+#define TAPE_NR(x) (iminor(x) & ~(-1 << ST_MODE_SHIFT))
+#define TAPE_MODE(x) ((iminor(x) & ST_MODE_MASK) >> ST_MODE_SHIFT)
/* Internal ioctl to set both density (uppermost 8 bits) and blocksize (lower
24 bits) */
@@ -786,7 +786,7 @@ static int check_tape(Scsi_Tape *STp, st
ST_partstat *STps;
char *name = tape_name(STp);
struct inode *inode = filp->f_dentry->d_inode;
- int mode = TAPE_MODE(inode->i_rdev);
+ int mode = TAPE_MODE(inode);
STp->ready = ST_READY;
@@ -980,7 +980,7 @@ static int st_open(struct inode *inode,
int i, retval = (-EIO);
Scsi_Tape *STp;
ST_partstat *STps;
- int dev = TAPE_NR(inode->i_rdev);
+ int dev = TAPE_NR(inode);
char *name;
write_lock(&st_dev_arr_lock);
@@ -1004,7 +1004,7 @@ static int st_open(struct inode *inode,
}
STp->in_use = 1;
write_unlock(&st_dev_arr_lock);
- STp->rew_at_close = STp->autorew_dev = (minor(inode->i_rdev) & 0x80) == 0;
+ STp->rew_at_close = STp->autorew_dev = (iminor(inode) & 0x80) == 0;
if (!scsi_block_when_processing_errors(STp->device)) {
diff -puN drivers/telephony/ixj.c~large-dev_t-10 drivers/telephony/ixj.c
--- 25/drivers/telephony/ixj.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/telephony/ixj.c 2003-08-26 18:29:24.000000000 -0700
@@ -278,8 +278,8 @@ static char ixj_c_revision[] = "$Revisio
#include "ixj.h"
-#define TYPE(dev) (minor(dev) >> 4)
-#define NUM(dev) (minor(dev) & 0xf)
+#define TYPE(inode) (iminor(inode) >> 4)
+#define NUM(inode) (iminor(inode) & 0xf)
static int ixjdebug;
static int hertz = HZ;
@@ -2273,7 +2273,7 @@ int ixj_release(struct inode *inode, str
schedule_timeout(1);
}
if (ixjdebug & 0x0002)
- printk(KERN_INFO "Closing board %d\n", NUM(inode->i_rdev));
+ printk(KERN_INFO "Closing board %d\n", NUM(inode));
if (j->cardtype == QTI_PHONECARD)
ixj_set_port(j, PORT_SPEAKER);
@@ -2858,7 +2858,7 @@ static void alaw2ulaw(unsigned char *buf
static ssize_t ixj_read(struct file * file_p, char *buf, size_t length, loff_t * ppos)
{
unsigned long i = *ppos;
- IXJ * j = get_ixj(NUM(file_p->f_dentry->d_inode->i_rdev));
+ IXJ * j = get_ixj(NUM(file_p->f_dentry->d_inode));
DECLARE_WAITQUEUE(wait, current);
@@ -2915,7 +2915,7 @@ static ssize_t ixj_enhanced_read(struct
{
int pre_retval;
ssize_t read_retval = 0;
- IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode->i_rdev));
+ IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode));
pre_retval = ixj_PreRead(j, 0L);
switch (pre_retval) {
@@ -2994,7 +2994,7 @@ static ssize_t ixj_enhanced_write(struct
int pre_retval;
ssize_t write_retval = 0;
- IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode->i_rdev));
+ IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode));
pre_retval = ixj_PreWrite(j, 0L);
switch (pre_retval) {
@@ -4707,7 +4707,7 @@ static unsigned int ixj_poll(struct file
{
unsigned int mask = 0;
- IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode->i_rdev));
+ IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode));
poll_wait(file_p, &(j->poll_q), wait);
if (j->read_buffer_ready > 0)
@@ -6208,10 +6208,10 @@ static int ixj_ioctl(struct inode *inode
IXJ_FILTER_RAW jfr;
unsigned int raise, mant;
- unsigned int minor = minor(inode->i_rdev);
- int board = NUM(inode->i_rdev);
+ unsigned int minor = iminor(inode);
+ int board = NUM(inode);
- IXJ *j = get_ixj(NUM(inode->i_rdev));
+ IXJ *j = get_ixj(NUM(inode));
int retval = 0;
@@ -6764,7 +6764,7 @@ static int ixj_ioctl(struct inode *inode
static int ixj_fasync(int fd, struct file *file_p, int mode)
{
- IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode->i_rdev));
+ IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode));
return fasync_helper(fd, file_p, mode, &j->async_queue);
}
diff -puN drivers/telephony/phonedev.c~large-dev_t-10 drivers/telephony/phonedev.c
--- 25/drivers/telephony/phonedev.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/telephony/phonedev.c 2003-08-26 18:29:24.000000000 -0700
@@ -46,7 +46,7 @@ static DECLARE_MUTEX(phone_lock);
static int phone_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
int err = 0;
struct phone_device *p;
struct file_operations *old_fops, *new_fops = NULL;
diff -puN drivers/usb/class/audio.c~large-dev_t-10 drivers/usb/class/audio.c
--- 25/drivers/usb/class/audio.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/usb/class/audio.c 2003-08-26 18:29:24.000000000 -0700
@@ -1955,7 +1955,7 @@ static inline int prog_dmabuf_out(struct
static int usb_audio_open_mixdev(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct list_head *devs, *mdevs;
struct usb_mixerdev *ms;
struct usb_audio_state *s;
@@ -2633,7 +2633,7 @@ static int usb_audio_ioctl(struct inode
static int usb_audio_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
struct list_head *devs, *adevs;
struct usb_audiodev *as;
diff -puN drivers/usb/class/usblp.c~large-dev_t-10 drivers/usb/class/usblp.c
--- 25/drivers/usb/class/usblp.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/usb/class/usblp.c 2003-08-26 18:29:24.000000000 -0700
@@ -318,7 +318,7 @@ static int usblp_check_status(struct usb
static int usblp_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct usblp *usblp;
struct usb_interface *intf;
int retval;
diff -puN drivers/usb/class/usb-midi.c~large-dev_t-10 drivers/usb/class/usb-midi.c
--- 25/drivers/usb/class/usb-midi.c~large-dev_t-10 2003-08-26 18:29:23.000000000 -0700
+++ 25-akpm/drivers/usb/class/usb-midi.c 2003-08-26 18:29:24.000000000 -0700
@@ -812,7 +812,7 @@ static unsigned int usb_midi_poll(struct
static int usb_midi_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
struct list_head *devs, *mdevs;
struct usb_midi_state *s;
diff -puN drivers/usb/core/file.c~large-dev_t-10 drivers/usb/core/file.c
--- 25/drivers/usb/core/file.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/drivers/usb/core/file.c 2003-08-26 18:29:24.000000000 -0700
@@ -34,7 +34,7 @@ static spinlock_t minor_lock = SPIN_LOCK
static int usb_open(struct inode * inode, struct file * file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct file_operations *c;
int err = -ENODEV;
struct file_operations *old_fops, *new_fops = NULL;
diff -puN drivers/usb/image/scanner.h~large-dev_t-10 drivers/usb/image/scanner.h
--- 25/drivers/usb/image/scanner.h~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/drivers/usb/image/scanner.h 2003-08-26 18:29:24.000000000 -0700
@@ -313,7 +313,7 @@ MODULE_DEVICE_TABLE (usb, scanner_device
#define IS_EP_BULK_OUT(ep) (IS_EP_BULK(ep) && ((ep)->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT)
#define IS_EP_INTR(ep) ((ep)->bmAttributes == USB_ENDPOINT_XFER_INT ? 1 : 0)
-#define USB_SCN_MINOR(X) minor((X)->i_rdev)
+#define USB_SCN_MINOR(X) iminor(X)
#ifdef DEBUG
#define SCN_DEBUG(X) X
diff -puN drivers/usb/input/hiddev.c~large-dev_t-10 drivers/usb/input/hiddev.c
--- 25/drivers/usb/input/hiddev.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/drivers/usb/input/hiddev.c 2003-08-26 18:29:24.000000000 -0700
@@ -271,7 +271,7 @@ static int hiddev_release(struct inode *
static int hiddev_open(struct inode * inode, struct file * file) {
struct hiddev_list *list;
- int i = minor(inode->i_rdev) - HIDDEV_MINOR_BASE;
+ int i = iminor(inode) - HIDDEV_MINOR_BASE;
if (i >= HIDDEV_MINORS || !hiddev_table[i])
return -ENODEV;
diff -puN drivers/usb/media/dabusb.c~large-dev_t-10 drivers/usb/media/dabusb.c
--- 25/drivers/usb/media/dabusb.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/drivers/usb/media/dabusb.c 2003-08-26 18:29:24.000000000 -0700
@@ -583,7 +583,7 @@ static ssize_t dabusb_read (struct file
static int dabusb_open (struct inode *inode, struct file *file)
{
- int devnum = minor (inode->i_rdev);
+ int devnum = iminor(inode);
pdabusb_t s;
if (devnum < DABUSB_MINOR || devnum >= (DABUSB_MINOR + NRDABUSB))
diff -puN drivers/usb/misc/auerswald.c~large-dev_t-10 drivers/usb/misc/auerswald.c
--- 25/drivers/usb/misc/auerswald.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/drivers/usb/misc/auerswald.c 2003-08-26 18:29:24.000000000 -0700
@@ -1380,7 +1380,7 @@ static void auerswald_removeservice (pau
/* Open a new character device */
static int auerchar_open (struct inode *inode, struct file *file)
{
- int dtindex = minor(inode->i_rdev);
+ int dtindex = iminor(inode);
pauerswald_t cp = NULL;
pauerchar_t ccp = NULL;
struct usb_interface *intf;
diff -puN drivers/usb/misc/brlvger.c~large-dev_t-10 drivers/usb/misc/brlvger.c
--- 25/drivers/usb/misc/brlvger.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/drivers/usb/misc/brlvger.c 2003-08-26 18:29:24.000000000 -0700
@@ -432,7 +432,7 @@ brlvger_disconnect(struct usb_interface
static int
brlvger_open(struct inode *inode, struct file *file)
{
- int devnum = minor (inode->i_rdev);
+ int devnum = iminor(inode);
struct usb_interface *intf = NULL;
struct brlvger_priv *priv = NULL;
int n, ret;
diff -puN drivers/usb/misc/tiglusb.c~large-dev_t-10 drivers/usb/misc/tiglusb.c
--- 25/drivers/usb/misc/tiglusb.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/drivers/usb/misc/tiglusb.c 2003-08-26 18:29:24.000000000 -0700
@@ -93,7 +93,7 @@ clear_pipes (struct usb_device *dev)
static int
tiglusb_open (struct inode *inode, struct file *filp)
{
- int devnum = minor (inode->i_rdev);
+ int devnum = iminor(inode);
ptiglusb_t s;
if (devnum < TIUSB_MINOR || devnum >= (TIUSB_MINOR + MAXTIGL))
diff -puN drivers/usb/usb-skeleton.c~large-dev_t-10 drivers/usb/usb-skeleton.c
--- 25/drivers/usb/usb-skeleton.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/drivers/usb/usb-skeleton.c 2003-08-26 18:29:24.000000000 -0700
@@ -229,7 +229,7 @@ static int skel_open (struct inode *inod
dbg("%s", __FUNCTION__);
- subminor = minor (inode->i_rdev);
+ subminor = iminor(inode);
/* prevent disconnects */
down (&disconnect_sem);
diff -puN drivers/video/fbmem.c~large-dev_t-10 drivers/video/fbmem.c
--- 25/drivers/video/fbmem.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/drivers/video/fbmem.c 2003-08-26 18:29:24.000000000 -0700
@@ -772,7 +772,7 @@ fb_read(struct file *file, char *buf, si
{
unsigned long p = *ppos;
struct inode *inode = file->f_dentry->d_inode;
- int fbidx = minor(inode->i_rdev);
+ int fbidx = iminor(inode);
struct fb_info *info = registered_fb[fbidx];
if (!info || ! info->screen_base)
@@ -806,7 +806,7 @@ fb_write(struct file *file, const char *
{
unsigned long p = *ppos;
struct inode *inode = file->f_dentry->d_inode;
- int fbidx = minor(inode->i_rdev);
+ int fbidx = iminor(inode);
struct fb_info *info = registered_fb[fbidx];
int err;
@@ -968,7 +968,7 @@ static int
fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
- int fbidx = minor(inode->i_rdev);
+ int fbidx = iminor(inode);
struct fb_info *info = registered_fb[fbidx];
struct fb_ops *fb = info->fbops;
struct fb_var_screeninfo var;
@@ -1054,7 +1054,7 @@ fb_ioctl(struct inode *inode, struct fil
static int
fb_mmap(struct file *file, struct vm_area_struct * vma)
{
- int fbidx = minor(file->f_dentry->d_inode->i_rdev);
+ int fbidx = iminor(file->f_dentry->d_inode);
struct fb_info *info = registered_fb[fbidx];
struct fb_ops *fb = info->fbops;
unsigned long off;
@@ -1153,7 +1153,7 @@ fb_mmap(struct file *file, struct vm_are
static int
fb_open(struct inode *inode, struct file *file)
{
- int fbidx = minor(inode->i_rdev);
+ int fbidx = iminor(inode);
struct fb_info *info;
int res = 0;
@@ -1178,7 +1178,7 @@ fb_open(struct inode *inode, struct file
static int
fb_release(struct inode *inode, struct file *file)
{
- int fbidx = minor(inode->i_rdev);
+ int fbidx = iminor(inode);
struct fb_info *info;
lock_kernel();
diff -puN drivers/video/stifb.c~large-dev_t-10 drivers/video/stifb.c
--- 25/drivers/video/stifb.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/drivers/video/stifb.c 2003-08-26 18:29:24.000000000 -0700
@@ -890,7 +890,7 @@ stifb_read(struct file *file, char *buf,
{
unsigned long p = *ppos;
struct inode *inode = file->f_dentry->d_inode;
- int fbidx = minor(inode->i_rdev);
+ int fbidx = iminor(inode);
struct fb_info *info = registered_fb[fbidx];
char tmpbuf[TMPBUFLEN];
@@ -922,7 +922,7 @@ static ssize_t
stifb_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
{
struct inode *inode = file->f_dentry->d_inode;
- int fbidx = minor(inode->i_rdev);
+ int fbidx = iminor(inode);
struct fb_info *info = registered_fb[fbidx];
unsigned long p = *ppos;
size_t c;
diff -puN fs/coda/inode.c~large-dev_t-10 fs/coda/inode.c
--- 25/fs/coda/inode.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/fs/coda/inode.c 2003-08-26 18:29:24.000000000 -0700
@@ -123,7 +123,7 @@ static int get_device_index(struct coda_
return -1;
}
- idx = minor(inode->i_rdev);
+ idx = iminor(inode);
fput(file);
if(idx < 0 || idx >= MAX_CODADEVS) {
diff -puN fs/coda/psdev.c~large-dev_t-10 fs/coda/psdev.c
--- 25/fs/coda/psdev.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/fs/coda/psdev.c 2003-08-26 18:29:24.000000000 -0700
@@ -279,7 +279,7 @@ static int coda_psdev_open(struct inode
int idx;
lock_kernel();
- idx = minor(inode->i_rdev);
+ idx = iminor(inode);
if(idx >= MAX_CODADEVS) {
unlock_kernel();
return -ENODEV;
diff -puN fs/jffs2/file.c~large-dev_t-10 fs/jffs2/file.c
--- 25/fs/jffs2/file.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/fs/jffs2/file.c 2003-08-26 18:29:24.000000000 -0700
@@ -104,7 +104,7 @@ int jffs2_setattr (struct dentry *dentry
if (S_ISBLK(inode->i_mode) || S_ISCHR(inode->i_mode)) {
/* For these, we don't actually need to read the old node */
dev = (major(dentry->d_inode->i_rdev) << 8) |
- minor(dentry->d_inode->i_rdev);
+ iminor(dentry->d_inode);
mdata = (char *)&dev;
mdatalen = sizeof(dev);
D1(printk(KERN_DEBUG "jffs2_setattr(): Writing %d bytes of kdev_t\n", mdatalen));
diff -puN fs/jffs2/os-linux.h~large-dev_t-10 fs/jffs2/os-linux.h
--- 25/fs/jffs2/os-linux.h~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/fs/jffs2/os-linux.h 2003-08-26 18:29:24.000000000 -0700
@@ -44,7 +44,7 @@
#define JFFS2_F_I_GID(f) (OFNI_EDONI_2SFFJ(f)->i_gid)
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,1)
-#define JFFS2_F_I_RDEV_MIN(f) (minor(OFNI_EDONI_2SFFJ(f)->i_rdev))
+#define JFFS2_F_I_RDEV_MIN(f) (iminor(OFNI_EDONI_2SFFJ(f)))
#define JFFS2_F_I_RDEV_MAJ(f) (major(OFNI_EDONI_2SFFJ(f)->i_rdev))
#else
#define JFFS2_F_I_RDEV_MIN(f) (MINOR(to_kdev_t(OFNI_EDONI_2SFFJ(f)->i_rdev)))
diff -puN include/linux/fs.h~large-dev_t-10 include/linux/fs.h
--- 25/include/linux/fs.h~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/include/linux/fs.h 2003-08-26 18:29:24.000000000 -0700
@@ -467,6 +467,11 @@ static inline void i_size_write(struct i
#endif
}
+static inline unsigned iminor(struct inode *inode)
+{
+ return minor(inode->i_rdev);
+}
+
struct fown_struct {
rwlock_t lock; /* protects pid, uid, euid fields */
int pid; /* pid or -pgrp where SIGIO should be sent */
diff -puN include/linux/nfsd/nfsfh.h~large-dev_t-10 include/linux/nfsd/nfsfh.h
--- 25/include/linux/nfsd/nfsfh.h~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/include/linux/nfsd/nfsfh.h 2003-08-26 18:29:24.000000000 -0700
@@ -295,7 +295,7 @@ fill_post_wcc(struct svc_fh *fhp)
fhp->fh_post_blocks = (inode->i_size+511) >> 9;
}
fhp->fh_post_rdev[0] = htonl((u32)major(inode->i_rdev));
- fhp->fh_post_rdev[1] = htonl((u32)minor(inode->i_rdev));
+ fhp->fh_post_rdev[1] = htonl((u32)iminor(inode));
fhp->fh_post_atime = inode->i_atime;
fhp->fh_post_mtime = inode->i_mtime;
fhp->fh_post_ctime = inode->i_ctime;
diff -puN net/netlink/netlink_dev.c~large-dev_t-10 net/netlink/netlink_dev.c
--- 25/net/netlink/netlink_dev.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/net/netlink/netlink_dev.c 2003-08-26 18:29:24.000000000 -0700
@@ -41,7 +41,7 @@ static struct socket *netlink_user[MAX_L
static unsigned int netlink_poll(struct file *file, poll_table * wait)
{
- struct socket *sock = netlink_user[minor(file->f_dentry->d_inode->i_rdev)];
+ struct socket *sock = netlink_user[iminor(file->f_dentry->d_inode)];
if (sock->ops->poll==NULL)
return 0;
@@ -56,7 +56,7 @@ static ssize_t netlink_write(struct file
size_t count, loff_t *pos)
{
struct inode *inode = file->f_dentry->d_inode;
- struct socket *sock = netlink_user[minor(inode->i_rdev)];
+ struct socket *sock = netlink_user[iminor(inode)];
struct msghdr msg;
struct iovec iov;
@@ -80,7 +80,7 @@ static ssize_t netlink_read(struct file
size_t count, loff_t *pos)
{
struct inode *inode = file->f_dentry->d_inode;
- struct socket *sock = netlink_user[minor(inode->i_rdev)];
+ struct socket *sock = netlink_user[iminor(inode)];
struct msghdr msg;
struct iovec iov;
@@ -100,7 +100,7 @@ static ssize_t netlink_read(struct file
static int netlink_open(struct inode * inode, struct file * file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct socket *sock;
struct sockaddr_nl nladdr;
int err;
@@ -132,7 +132,7 @@ out:
static int netlink_release(struct inode * inode, struct file * file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct socket *sock;
sock = netlink_user[minor];
@@ -146,7 +146,7 @@ static int netlink_release(struct inode
static int netlink_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
int retval = 0;
if (minor >= MAX_LINKS)
diff -puN sound/core/control.c~large-dev_t-10 sound/core/control.c
--- 25/sound/core/control.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/core/control.c 2003-08-26 18:29:24.000000000 -0700
@@ -42,7 +42,7 @@ static LIST_HEAD(snd_control_ioctls);
static int snd_ctl_open(struct inode *inode, struct file *file)
{
- int cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
+ int cardnum = SNDRV_MINOR_CARD(iminor(inode));
unsigned long flags;
snd_card_t *card;
snd_ctl_file_t *ctl;
diff -puN sound/core/hwdep.c~large-dev_t-10 sound/core/hwdep.c
--- 25/sound/core/hwdep.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/core/hwdep.c 2003-08-26 18:29:24.000000000 -0700
@@ -82,12 +82,12 @@ static int snd_hwdep_open(struct inode *
switch (major) {
case CONFIG_SND_MAJOR:
- cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
- device = SNDRV_MINOR_DEVICE(minor(inode->i_rdev)) - SNDRV_MINOR_HWDEP;
+ cardnum = SNDRV_MINOR_CARD(iminor(inode));
+ device = SNDRV_MINOR_DEVICE(iminor(inode)) - SNDRV_MINOR_HWDEP;
break;
#ifdef CONFIG_SND_OSSEMUL
case SOUND_MAJOR:
- cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
+ cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));
device = 0;
break;
#endif
diff -puN sound/core/oss/mixer_oss.c~large-dev_t-10 sound/core/oss/mixer_oss.c
--- 25/sound/core/oss/mixer_oss.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/core/oss/mixer_oss.c 2003-08-26 18:29:24.000000000 -0700
@@ -36,7 +36,7 @@ MODULE_LICENSE("GPL");
static int snd_mixer_oss_open(struct inode *inode, struct file *file)
{
- int cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
+ int cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));
snd_card_t *card;
snd_mixer_oss_file_t *fmixer;
int err;
diff -puN sound/core/oss/pcm_oss.c~large-dev_t-10 sound/core/oss/pcm_oss.c
--- 25/sound/core/oss/pcm_oss.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/core/oss/pcm_oss.c 2003-08-26 18:29:24.000000000 -0700
@@ -1681,7 +1681,7 @@ static int snd_pcm_oss_open_file(struct
static int snd_pcm_oss_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int cardnum = SNDRV_MINOR_OSS_CARD(minor);
int device;
int err;
diff -puN sound/core/pcm_native.c~large-dev_t-10 sound/core/pcm_native.c
--- 25/sound/core/pcm_native.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/core/pcm_native.c 2003-08-26 18:29:24.000000000 -0700
@@ -1435,7 +1435,7 @@ static struct file *snd_pcm_file_fd(int
fput(file);
return 0;
}
- minor = minor(inode->i_rdev);
+ minor = iminor(inode);
if (minor >= 256 ||
minor % SNDRV_MINOR_DEVICES < SNDRV_MINOR_PCM_PLAYBACK) {
fput(file);
@@ -1940,8 +1940,8 @@ static int snd_pcm_open_file(struct file
int snd_pcm_open(struct inode *inode, struct file *file)
{
- int cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
- int device = SNDRV_MINOR_DEVICE(minor(inode->i_rdev));
+ int cardnum = SNDRV_MINOR_CARD(iminor(inode));
+ int device = SNDRV_MINOR_DEVICE(iminor(inode));
int err;
snd_pcm_t *pcm;
snd_pcm_file_t *pcm_file;
diff -puN sound/core/rawmidi.c~large-dev_t-10 sound/core/rawmidi.c
--- 25/sound/core/rawmidi.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/core/rawmidi.c 2003-08-26 18:29:24.000000000 -0700
@@ -359,16 +359,16 @@ static int snd_rawmidi_open(struct inode
switch (maj) {
case CONFIG_SND_MAJOR:
- cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
+ cardnum = SNDRV_MINOR_CARD(iminor(inode));
cardnum %= SNDRV_CARDS;
- device = SNDRV_MINOR_DEVICE(minor(inode->i_rdev)) - SNDRV_MINOR_RAWMIDI;
+ device = SNDRV_MINOR_DEVICE(iminor(inode)) - SNDRV_MINOR_RAWMIDI;
device %= SNDRV_MINOR_RAWMIDIS;
break;
#ifdef CONFIG_SND_OSSEMUL
case SOUND_MAJOR:
- cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
+ cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));
cardnum %= SNDRV_CARDS;
- device = SNDRV_MINOR_OSS_DEVICE(minor(inode->i_rdev)) == SNDRV_MINOR_OSS_MIDI ?
+ device = SNDRV_MINOR_OSS_DEVICE(iminor(inode)) == SNDRV_MINOR_OSS_MIDI ?
midi_map[cardnum] : amidi_map[cardnum];
break;
#endif
diff -puN sound/core/seq/oss/seq_oss.c~large-dev_t-10 sound/core/seq/oss/seq_oss.c
--- 25/sound/core/seq/oss/seq_oss.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/core/seq/oss/seq_oss.c 2003-08-26 18:29:24.000000000 -0700
@@ -121,7 +121,7 @@ odev_open(struct inode *inode, struct fi
{
int level, rc;
- if (minor(inode->i_rdev) == SNDRV_MINOR_OSS_MUSIC)
+ if (iminor(inode) == SNDRV_MINOR_OSS_MUSIC)
level = SNDRV_SEQ_OSS_MODE_MUSIC;
else
level = SNDRV_SEQ_OSS_MODE_SYNTH;
diff -puN sound/core/sound.c~large-dev_t-10 sound/core/sound.c
--- 25/sound/core/sound.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/core/sound.c 2003-08-26 18:29:24.000000000 -0700
@@ -117,7 +117,7 @@ static snd_minor_t *snd_minor_search(int
static int snd_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int card = SNDRV_MINOR_CARD(minor);
int dev = SNDRV_MINOR_DEVICE(minor);
snd_minor_t *mptr = NULL;
diff -puN sound/oss/ad1889.c~large-dev_t-10 sound/oss/ad1889.c
--- 25/sound/oss/ad1889.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/ad1889.c 2003-08-26 18:29:24.000000000 -0700
@@ -755,7 +755,7 @@ static int ad1889_ioctl(struct inode *in
static int ad1889_open(struct inode *inode, struct file *file)
{
/* check minor; only support /dev/dsp atm */
- if (minor(inode->i_rdev) != 3)
+ if (iminor(inode) != 3)
return -ENXIO;
file->private_data = ad1889_dev;
@@ -788,7 +788,7 @@ static struct file_operations ad1889_fop
/************************* /dev/mixer interfaces ************************ */
static int ad1889_mixer_open(struct inode *inode, struct file *file)
{
- if (ad1889_dev->ac97_codec->dev_mixer != minor(inode->i_rdev))
+ if (ad1889_dev->ac97_codec->dev_mixer != iminor(inode))
return -ENODEV;
file->private_data = ad1889_dev->ac97_codec;
diff -puN sound/oss/ali5455.c~large-dev_t-10 sound/oss/ali5455.c
--- 25/sound/oss/ali5455.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/ali5455.c 2003-08-26 18:29:24.000000000 -0700
@@ -3026,7 +3026,7 @@ static void ali_ac97_set(struct ac97_cod
static int ali_open_mixdev(struct inode *inode, struct file *file)
{
int i;
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct ali_card *card = devs;
for (card = devs; card != NULL; card = card->next) {
/*
diff -puN sound/oss/au1000.c~large-dev_t-10 sound/oss/au1000.c
--- 25/sound/oss/au1000.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/au1000.c 2003-08-26 18:29:24.000000000 -0700
@@ -1842,7 +1842,7 @@ static int au1000_ioctl(struct inode *in
static int au1000_open(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
struct au1000_state *s = &au1000_state;
int ret;
diff -puN sound/oss/btaudio.c~large-dev_t-10 sound/oss/btaudio.c
--- 25/sound/oss/btaudio.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/btaudio.c 2003-08-26 18:29:24.000000000 -0700
@@ -299,7 +299,7 @@ static void stop_recording(struct btaudi
static int btaudio_mixer_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct btaudio *bta;
for (bta = btaudios; bta != NULL; bta = bta->next)
@@ -458,7 +458,7 @@ static int btaudio_dsp_open(struct inode
static int btaudio_dsp_open_digital(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct btaudio *bta;
for (bta = btaudios; bta != NULL; bta = bta->next)
@@ -474,7 +474,7 @@ static int btaudio_dsp_open_digital(stru
static int btaudio_dsp_open_analog(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct btaudio *bta;
for (bta = btaudios; bta != NULL; bta = bta->next)
diff -puN sound/oss/cmpci.c~large-dev_t-10 sound/oss/cmpci.c
--- 25/sound/oss/cmpci.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/cmpci.c 2003-08-26 18:29:24.000000000 -0700
@@ -1448,7 +1448,7 @@ static int mixer_ioctl(struct cm_state *
static int cm_open_mixdev(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct cm_state *s = devs;
while (s && s->dev_mixer != minor)
@@ -2207,7 +2207,7 @@ static int cm_ioctl(struct inode *inode,
static int cm_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct cm_state *s = devs;
unsigned char fmtm = ~0, fmts = 0;
@@ -2462,7 +2462,7 @@ static unsigned int cm_midi_poll(struct
static int cm_midi_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct cm_state *s = devs;
unsigned long flags;
@@ -2679,7 +2679,7 @@ static int cm_dmfm_ioctl(struct inode *i
static int cm_dmfm_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct cm_state *s = devs;
while (s && s->dev_dmfm != minor)
diff -puN sound/oss/cs4281/cs4281m.c~large-dev_t-10 sound/oss/cs4281/cs4281m.c
--- 25/sound/oss/cs4281/cs4281m.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/cs4281/cs4281m.c 2003-08-26 18:29:24.000000000 -0700
@@ -2567,7 +2567,7 @@ static int mixer_ioctl(struct cs4281_sta
static int cs4281_open_mixdev(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct cs4281_state *s=NULL;
struct list_head *entry;
@@ -3624,7 +3624,7 @@ static int cs4281_release(struct inode *
static int cs4281_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct cs4281_state *s=NULL;
struct list_head *entry;
@@ -3966,7 +3966,7 @@ static unsigned int cs4281_midi_poll(str
static int cs4281_midi_open(struct inode *inode, struct file *file)
{
unsigned long flags, temp1;
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct cs4281_state *s=NULL;
struct list_head *entry;
list_for_each(entry, &cs4281_devs)
diff -puN sound/oss/cs46xx.c~large-dev_t-10 sound/oss/cs46xx.c
--- 25/sound/oss/cs46xx.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/cs46xx.c 2003-08-26 18:29:24.000000000 -0700
@@ -1838,7 +1838,7 @@ static unsigned int cs_midi_poll(struct
static int cs_midi_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct cs_card *card=NULL;
unsigned long flags;
struct list_head *entry;
@@ -3200,7 +3200,7 @@ static int cs_open(struct inode *inode,
struct cs_state *state = NULL;
struct dmabuf *dmabuf = NULL;
struct list_head *entry;
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
int ret=0;
unsigned int tmp;
@@ -4066,7 +4066,7 @@ static void cs_ac97_set(struct ac97_code
static int cs_open_mixdev(struct inode *inode, struct file *file)
{
int i=0;
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct cs_card *card=NULL;
struct list_head *entry;
unsigned int tmp;
@@ -4113,7 +4113,7 @@ static int cs_open_mixdev(struct inode *
static int cs_release_mixdev(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct cs_card *card=NULL;
struct list_head *entry;
int i;
diff -puN sound/oss/dmasound/dmasound_core.c~large-dev_t-10 sound/oss/dmasound/dmasound_core.c
--- 25/sound/oss/dmasound/dmasound_core.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/dmasound/dmasound_core.c 2003-08-26 18:29:24.000000000 -0700
@@ -904,7 +904,7 @@ static int sq_open(struct inode *inode,
O_RDONLY and dsp1 could be opened O_WRONLY
*/
- dmasound.minDev = minor(inode->i_rdev) & 0x0f;
+ dmasound.minDev = iminor(inode) & 0x0f;
/* OK. - we should make some attempt at consistency. At least the H'ware
options should be set with a valid mode. We will make it that the LL
diff -puN sound/oss/emu10k1/audio.c~large-dev_t-10 sound/oss/emu10k1/audio.c
--- 25/sound/oss/emu10k1/audio.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/emu10k1/audio.c 2003-08-26 18:29:24.000000000 -0700
@@ -1112,7 +1112,7 @@ static int emu10k1_audio_mmap(struct fil
static int emu10k1_audio_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct emu10k1_card *card = NULL;
struct list_head *entry;
struct emu10k1_wavedevice *wave_dev;
diff -puN sound/oss/emu10k1/midi.c~large-dev_t-10 sound/oss/emu10k1/midi.c
--- 25/sound/oss/emu10k1/midi.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/emu10k1/midi.c 2003-08-26 18:29:24.000000000 -0700
@@ -86,7 +86,7 @@ static int midiin_add_buffer(struct emu1
static int emu10k1_midi_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct emu10k1_card *card = NULL;
struct emu10k1_mididevice *midi_dev;
struct list_head *entry;
diff -puN sound/oss/emu10k1/mixer.c~large-dev_t-10 sound/oss/emu10k1/mixer.c
--- 25/sound/oss/emu10k1/mixer.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/emu10k1/mixer.c 2003-08-26 18:29:24.000000000 -0700
@@ -654,7 +654,7 @@ static int emu10k1_mixer_ioctl(struct in
static int emu10k1_mixer_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct emu10k1_card *card = NULL;
struct list_head *entry;
diff -puN sound/oss/es1370.c~large-dev_t-10 sound/oss/es1370.c
--- 25/sound/oss/es1370.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/es1370.c 2003-08-26 18:29:24.000000000 -0700
@@ -1023,7 +1023,7 @@ static int mixer_ioctl(struct es1370_sta
static int es1370_open_mixdev(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct list_head *list;
struct es1370_state *s;
@@ -1727,7 +1727,7 @@ static int es1370_ioctl(struct inode *in
static int es1370_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct list_head *list;
@@ -2165,7 +2165,7 @@ static int es1370_ioctl_dac(struct inode
static int es1370_open_dac(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct list_head *list;
@@ -2408,7 +2408,7 @@ static unsigned int es1370_midi_poll(str
static int es1370_midi_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct list_head *list;
diff -puN sound/oss/es1371.c~large-dev_t-10 sound/oss/es1371.c
--- 25/sound/oss/es1371.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/es1371.c 2003-08-26 18:29:24.000000000 -0700
@@ -1210,7 +1210,7 @@ static int mixdev_ioctl(struct ac97_code
static int es1371_open_mixdev(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct list_head *list;
struct es1371_state *s;
@@ -1914,7 +1914,7 @@ static int es1371_ioctl(struct inode *in
static int es1371_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct list_head *list;
@@ -2345,7 +2345,7 @@ static int es1371_ioctl_dac(struct inode
static int es1371_open_dac(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct list_head *list;
@@ -2587,7 +2587,7 @@ static unsigned int es1371_midi_poll(str
static int es1371_midi_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct list_head *list;
diff -puN sound/oss/esssolo1.c~large-dev_t-10 sound/oss/esssolo1.c
--- 25/sound/oss/esssolo1.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/esssolo1.c 2003-08-26 18:29:24.000000000 -0700
@@ -913,7 +913,7 @@ static int mixer_ioctl(struct solo1_stat
static int solo1_open_mixdev(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct solo1_state *s = NULL;
struct pci_dev *pci_dev = NULL;
@@ -1594,7 +1594,7 @@ static int solo1_release(struct inode *i
static int solo1_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
struct solo1_state *s = NULL;
struct pci_dev *pci_dev = NULL;
@@ -1884,7 +1884,7 @@ static unsigned int solo1_midi_poll(stru
static int solo1_midi_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct solo1_state *s = NULL;
@@ -2106,7 +2106,7 @@ static int solo1_dmfm_ioctl(struct inode
static int solo1_dmfm_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
struct solo1_state *s = NULL;
struct pci_dev *pci_dev = NULL;
diff -puN sound/oss/hal2.c~large-dev_t-10 sound/oss/hal2.c
--- 25/sound/oss/hal2.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/hal2.c 2003-08-26 18:29:24.000000000 -0700
@@ -867,7 +867,7 @@ static int hal2_mixer_ioctl(hal2_card_t
static int hal2_open_mixdev(struct inode *inode, struct file *file)
{
- hal2_card_t *hal2 = hal2_mixer_find_card(MINOR(inode->i_rdev));
+ hal2_card_t *hal2 = hal2_mixer_find_card(iminor(inode));
if (hal2) {
file->private_data = hal2;
@@ -1242,7 +1242,7 @@ static unsigned int hal2_poll(struct fil
static int hal2_open(struct inode *inode, struct file *file)
{
int err;
- hal2_card_t *hal2 = hal2_dsp_find_card(MINOR(inode->i_rdev));
+ hal2_card_t *hal2 = hal2_dsp_find_card(iminor(inode));
DEBUG("opening audio device.\n");
diff -puN sound/oss/i810_audio.c~large-dev_t-10 sound/oss/i810_audio.c
--- 25/sound/oss/i810_audio.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/i810_audio.c 2003-08-26 18:29:24.000000000 -0700
@@ -2648,7 +2648,7 @@ static void i810_ac97_set(struct ac97_co
static int i810_open_mixdev(struct inode *inode, struct file *file)
{
int i;
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct i810_card *card = devs;
for (card = devs; card != NULL; card = card->next) {
diff -puN sound/oss/ite8172.c~large-dev_t-10 sound/oss/ite8172.c
--- 25/sound/oss/ite8172.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/ite8172.c 2003-08-26 18:29:24.000000000 -0700
@@ -867,7 +867,7 @@ static loff_t it8172_llseek(struct file
static int it8172_open_mixdev(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = iminor(inode);
struct list_head *list;
struct it8172_state *s;
@@ -1771,7 +1771,7 @@ static int it8172_ioctl(struct inode *in
static int it8172_open(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct list_head *list;
diff -puN sound/oss/maestro3.c~large-dev_t-10 sound/oss/maestro3.c
--- 25/sound/oss/maestro3.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/maestro3.c 2003-08-26 18:29:24.000000000 -0700
@@ -1980,7 +1980,7 @@ free_dmabuf(struct pci_dev *pci_dev, str
static int m3_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct m3_card *c;
struct m3_state *s = NULL;
int i;
@@ -2149,7 +2149,7 @@ out:
/* OSS /dev/mixer file operation methods */
static int m3_open_mixdev(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct m3_card *card = devs;
for (card = devs; card != NULL; card = card->next) {
diff -puN sound/oss/maestro.c~large-dev_t-10 sound/oss/maestro.c
--- 25/sound/oss/maestro.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/maestro.c 2003-08-26 18:29:24.000000000 -0700
@@ -2138,7 +2138,7 @@ static int mixer_ioctl(struct ess_card *
/* --------------------------------------------------------------------- */
static int ess_open_mixdev(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct ess_card *card = NULL;
struct pci_dev *pdev = NULL;
struct pci_driver *drvr;
@@ -2983,7 +2983,7 @@ free_buffers(struct ess_state *s)
static int
ess_open(struct inode *inode, struct file *file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct ess_state *s = NULL;
unsigned char fmtm = ~0, fmts = 0;
struct pci_dev *pdev = NULL;
diff -puN sound/oss/msnd_pinnacle.c~large-dev_t-10 sound/oss/msnd_pinnacle.c
--- 25/sound/oss/msnd_pinnacle.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/msnd_pinnacle.c 2003-08-26 18:29:24.000000000 -0700
@@ -646,7 +646,7 @@ static int mixer_ioctl(unsigned int cmd,
static int dev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
if (cmd == OSS_GETVERSION) {
int sound_version = SOUND_VERSION;
@@ -758,7 +758,7 @@ static void set_default_audio_parameters
static int dev_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int err = 0;
if (minor == dev.dsp_minor) {
@@ -793,7 +793,7 @@ static int dev_open(struct inode *inode,
static int dev_release(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int err = 0;
lock_kernel();
@@ -983,7 +983,7 @@ static int dsp_write(const char *buf, si
static ssize_t dev_read(struct file *file, char *buf, size_t count, loff_t *off)
{
- int minor = minor(file->f_dentry->d_inode->i_rdev);
+ int minor = iminor(file->f_dentry->d_inode);
if (minor == dev.dsp_minor)
return dsp_read(buf, count);
else
@@ -992,7 +992,7 @@ static ssize_t dev_read(struct file *fil
static ssize_t dev_write(struct file *file, const char *buf, size_t count, loff_t *off)
{
- int minor = minor(file->f_dentry->d_inode->i_rdev);
+ int minor = iminor(file->f_dentry->d_inode);
if (minor == dev.dsp_minor)
return dsp_write(buf, count);
else
diff -puN sound/oss/nec_vrc5477.c~large-dev_t-10 sound/oss/nec_vrc5477.c
--- 25/sound/oss/nec_vrc5477.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/nec_vrc5477.c 2003-08-26 18:29:24.000000000 -0700
@@ -857,7 +857,7 @@ static irqreturn_t vrc5477_ac97_interrup
static int vrc5477_ac97_open_mixdev(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct list_head *list;
struct vrc5477_ac97_state *s;
@@ -1569,7 +1569,7 @@ static int vrc5477_ac97_ioctl(struct ino
static int vrc5477_ac97_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct list_head *list;
diff -puN sound/oss/rme96xx.c~large-dev_t-10 sound/oss/rme96xx.c
--- 25/sound/oss/rme96xx.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/rme96xx.c 2003-08-26 18:29:24.000000000 -0700
@@ -1445,7 +1445,7 @@ static int rme96xx_ioctl(struct inode *i
static int rme96xx_open(struct inode *in, struct file *f)
{
- int minor = minor(in->i_rdev);
+ int minor = iminor(in);
struct list_head *list;
int devnum;
rme96xx_info *s;
@@ -1769,7 +1769,7 @@ static struct file_operations rme96xx_au
static int rme96xx_mixer_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct list_head *list;
rme96xx_info *s;
diff -puN sound/oss/sonicvibes.c~large-dev_t-10 sound/oss/sonicvibes.c
--- 25/sound/oss/sonicvibes.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/sonicvibes.c 2003-08-26 18:29:24.000000000 -0700
@@ -1238,7 +1238,7 @@ static int mixer_ioctl(struct sv_state *
static int sv_open_mixdev(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct list_head *list;
struct sv_state *s;
@@ -1900,7 +1900,7 @@ static int sv_ioctl(struct inode *inode,
static int sv_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned char fmtm = ~0, fmts = 0;
struct list_head *list;
@@ -2149,7 +2149,7 @@ static unsigned int sv_midi_poll(struct
static int sv_midi_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct list_head *list;
@@ -2371,7 +2371,7 @@ static int sv_dmfm_ioctl(struct inode *i
static int sv_dmfm_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
DECLARE_WAITQUEUE(wait, current);
struct list_head *list;
struct sv_state *s;
diff -puN sound/oss/soundcard.c~large-dev_t-10 sound/oss/soundcard.c
--- 25/sound/oss/soundcard.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/soundcard.c 2003-08-26 18:29:24.000000000 -0700
@@ -144,7 +144,7 @@ static int get_mixer_levels(caddr_t arg)
static ssize_t sound_read(struct file *file, char *buf, size_t count, loff_t *ppos)
{
- int dev = minor(file->f_dentry->d_inode->i_rdev);
+ int dev = iminor(file->f_dentry->d_inode);
int ret = -EINVAL;
/*
@@ -177,7 +177,7 @@ static ssize_t sound_read(struct file *f
static ssize_t sound_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
{
- int dev = minor(file->f_dentry->d_inode->i_rdev);
+ int dev = iminor(file->f_dentry->d_inode);
int ret = -EINVAL;
lock_kernel();
@@ -204,7 +204,7 @@ static ssize_t sound_write(struct file *
static int sound_open(struct inode *inode, struct file *file)
{
- int dev = minor(inode->i_rdev);
+ int dev = iminor(inode);
int retval;
DEB(printk("sound_open(dev=%d)\n", dev));
@@ -253,7 +253,7 @@ static int sound_open(struct inode *inod
static int sound_release(struct inode *inode, struct file *file)
{
- int dev = minor(inode->i_rdev);
+ int dev = iminor(inode);
lock_kernel();
DEB(printk("sound_release(dev=%d)\n", dev));
@@ -333,7 +333,7 @@ static int sound_ioctl(struct inode *ino
unsigned int cmd, unsigned long arg)
{
int err, len = 0, dtype;
- int dev = minor(inode->i_rdev);
+ int dev = iminor(inode);
if (_SIOC_DIR(cmd) != _SIOC_NONE && _SIOC_DIR(cmd) != 0) {
/*
@@ -396,7 +396,7 @@ static int sound_ioctl(struct inode *ino
static unsigned int sound_poll(struct file *file, poll_table * wait)
{
struct inode *inode = file->f_dentry->d_inode;
- int dev = minor(inode->i_rdev);
+ int dev = iminor(inode);
DEB(printk("sound_poll(dev=%d)\n", dev));
switch (dev & 0x0f) {
@@ -420,7 +420,7 @@ static int sound_mmap(struct file *file,
int dev_class;
unsigned long size;
struct dma_buffparms *dmap = NULL;
- int dev = minor(file->f_dentry->d_inode->i_rdev);
+ int dev = iminor(file->f_dentry->d_inode);
dev_class = dev & 0x0f;
dev >>= 4;
diff -puN sound/oss/swarm_cs4297a.c~large-dev_t-10 sound/oss/swarm_cs4297a.c
--- 25/sound/oss/swarm_cs4297a.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/swarm_cs4297a.c 2003-08-26 18:29:24.000000000 -0700
@@ -1537,7 +1537,7 @@ static loff_t cs4297a_llseek(struct file
static int cs4297a_open_mixdev(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = iminor(inode);
struct cs4297a_state *s=NULL;
struct list_head *entry;
@@ -2386,7 +2386,7 @@ static int cs4297a_release(struct inode
static int cs4297a_open(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = iminor(inode);
struct cs4297a_state *s=NULL;
struct list_head *entry;
diff -puN sound/oss/trident.c~large-dev_t-10 sound/oss/trident.c
--- 25/sound/oss/trident.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/trident.c 2003-08-26 18:29:24.000000000 -0700
@@ -2600,7 +2600,7 @@ static int trident_ioctl(struct inode *i
static int trident_open(struct inode *inode, struct file *file)
{
int i = 0;
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct trident_card *card = devs;
struct trident_state *state = NULL;
struct dmabuf *dmabuf = NULL;
@@ -3883,7 +3883,7 @@ static int ali_write_proc(struct file *f
static int trident_open_mixdev(struct inode *inode, struct file *file)
{
int i = 0;
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct trident_card *card = devs;
for (card = devs; card != NULL; card = card->next)
diff -puN sound/oss/via82cxxx_audio.c~large-dev_t-10 sound/oss/via82cxxx_audio.c
--- 25/sound/oss/via82cxxx_audio.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/via82cxxx_audio.c 2003-08-26 18:29:24.000000000 -0700
@@ -1556,7 +1556,7 @@ out:
static int via_mixer_open (struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct via_info *card;
struct pci_dev *pdev = NULL;
struct pci_driver *drvr;
@@ -3252,7 +3252,7 @@ static int via_dsp_ioctl (struct inode *
static int via_dsp_open (struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct via_info *card;
struct pci_dev *pdev = NULL;
struct via_channel *chan;
diff -puN sound/oss/vwsnd.c~large-dev_t-10 sound/oss/vwsnd.c
--- 25/sound/oss/vwsnd.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/vwsnd.c 2003-08-26 18:29:24.000000000 -0700
@@ -2916,7 +2916,7 @@ static int vwsnd_audio_mmap(struct file
static int vwsnd_audio_open(struct inode *inode, struct file *file)
{
vwsnd_dev_t *devc;
- dev_t minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int sw_samplefmt;
DBGE("(inode=0x%p, file=0x%p)\n", inode, file);
@@ -3063,7 +3063,7 @@ static int vwsnd_mixer_open(struct inode
INC_USE_COUNT;
for (devc = vwsnd_dev_list; devc; devc = devc->next_dev)
- if (devc->mixer_minor == minor(inode->i_rdev))
+ if (devc->mixer_minor == iminor(inode))
break;
if (devc == NULL) {
diff -puN sound/oss/ymfpci.c~large-dev_t-10 sound/oss/ymfpci.c
--- 25/sound/oss/ymfpci.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/oss/ymfpci.c 2003-08-26 18:29:24.000000000 -0700
@@ -1905,7 +1905,7 @@ static int ymf_open(struct inode *inode,
struct ymf_state *state;
int err;
- minor = minor(inode->i_rdev);
+ minor = iminor(inode);
if ((minor & 0x0F) == 3) { /* /dev/dspN */
;
} else {
@@ -2019,7 +2019,7 @@ static int ymf_release(struct inode *ino
*/
static int ymf_open_mixdev(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
struct list_head *list;
ymfpci_t *unit;
int i;
diff -puN sound/sound_core.c~large-dev_t-10 sound/sound_core.c
--- 25/sound/sound_core.c~large-dev_t-10 2003-08-26 18:29:24.000000000 -0700
+++ 25-akpm/sound/sound_core.c 2003-08-26 18:29:24.000000000 -0700
@@ -483,7 +483,7 @@ static struct sound_unit *__look_for_uni
int soundcore_open(struct inode *inode, struct file *file)
{
int chain;
- int unit = minor(inode->i_rdev);
+ int unit = iminor(inode);
struct sound_unit *s;
struct file_operations *new_fops = NULL;
_