* [KJ] [Patch] cleanup inode->r_dev usage in arch/cris
@ 2006-04-11 21:25 Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in Eric Sesterhenn
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Eric Sesterhenn @ 2006-04-11 21:25 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 4092 bytes --]
hi,
imajor()/iminor() should be used instead of accessing r_dev
directly. This patch cleans up arch/cris
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
--- linux-2.6.17-rc1/arch/cris/arch-v10/drivers/eeprom.c.orig 2006-04-11 23:18:21.000000000 +0200
+++ linux-2.6.17-rc1/arch/cris/arch-v10/drivers/eeprom.c 2006-04-11 23:18:55.000000000 +0200
@@ -451,9 +451,9 @@ 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)
+ if(imajor(inode) != EEPROM_MAJOR_NR)
return -ENXIO;
if( eeprom.size > 0 )
--- linux-2.6.17-rc1/arch/cris/arch-v10/drivers/gpio.c.orig 2006-04-11 23:19:03.000000000 +0200
+++ linux-2.6.17-rc1/arch/cris/arch-v10/drivers/gpio.c 2006-04-11 23:19:18.000000000 +0200
@@ -436,7 +436,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;
--- linux-2.6.17-rc1/arch/cris/arch-v32/drivers/cryptocop.c.orig 2006-04-11 23:19:34.000000000 +0200
+++ linux-2.6.17-rc1/arch/cris/arch-v32/drivers/cryptocop.c 2006-04-11 23:19:47.000000000 +0200
@@ -2302,7 +2302,7 @@ static int cryptocop_job_setup(struct cr
static int cryptocop_open(struct inode *inode, struct file *filp)
{
- int p = MINOR(inode->i_rdev);
+ int p = iminor(inode);
if (p != CRYPTOCOP_MINOR) return -EINVAL;
--- linux-2.6.17-rc1/arch/cris/arch-v32/drivers/gpio.c.orig 2006-04-11 23:19:56.000000000 +0200
+++ linux-2.6.17-rc1/arch/cris/arch-v32/drivers/gpio.c 2006-04-11 23:20:10.000000000 +0200
@@ -419,7 +419,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;
--- linux-2.6.17-rc1/arch/cris/arch-v32/drivers/sync_serial.c.orig 2006-04-11 23:20:18.000000000 +0200
+++ linux-2.6.17-rc1/arch/cris/arch-v32/drivers/sync_serial.c 2006-04-11 23:21:45.000000000 +0200
@@ -341,7 +341,7 @@ static inline int sync_data_avail_to_end
static int sync_serial_open(struct inode *inode, struct file *file)
{
- int dev = MINOR(inode->i_rdev);
+ int dev = iminor(inode);
sync_port* port;
reg_dma_rw_cfg cfg = {.en = regk_dma_yes};
reg_dma_rw_intr_mask intr_mask = {.data = regk_dma_yes};
@@ -487,7 +487,7 @@ static int sync_serial_open(struct inode
static int sync_serial_release(struct inode *inode, struct file *file)
{
- int dev = MINOR(inode->i_rdev);
+ int dev = iminor(inode);
sync_port* port;
if (dev < 0 || dev >= NUMBER_OF_PORTS || !ports[dev].enabled)
@@ -505,7 +505,7 @@ static int sync_serial_release(struct in
static unsigned int sync_serial_poll(struct file *file, poll_table *wait)
{
- int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+ int dev = iminor(file->f_dentry->d_inode);
unsigned int mask = 0;
sync_port* port;
DEBUGPOLL( static unsigned int prev_mask = 0; );
@@ -532,7 +532,7 @@ static int sync_serial_ioctl(struct inod
unsigned int cmd, unsigned long arg)
{
int return_val = 0;
- int dev = MINOR(file->f_dentry->d_inode->i_rdev);
+ int dev = iminor(file->f_dentry->d_inode);
sync_port* port;
reg_sser_rw_tr_cfg tr_cfg;
reg_sser_rw_rec_cfg rec_cfg;
@@ -790,7 +790,7 @@ static int sync_serial_ioctl(struct inod
static ssize_t sync_serial_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);
DECLARE_WAITQUEUE(wait, current);
sync_port *port;
unsigned long c, c1;
@@ -920,7 +920,7 @@ static ssize_t sync_serial_write(struct
static ssize_t sync_serial_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 avail;
sync_port *port;
unsigned char* start;
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 5+ messages in thread* [KJ] [Patch] cleanup inode->r_dev usage in
2006-04-11 21:25 [KJ] [Patch] cleanup inode->r_dev usage in arch/cris Eric Sesterhenn
@ 2006-04-12 14:58 ` Eric Sesterhenn
2006-04-12 14:58 ` Eric Sesterhenn
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Eric Sesterhenn @ 2006-04-12 14:58 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
hi,
imajor()/iminor() should be used instead of accessing r_dev
directly. This patch cleans up drivers/block/aoe/aoechr.c
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
--- linux-2.6.17-rc1-git5/drivers/block/aoe/aoechr.c.orig 2006-04-12 13:50:00.000000000 +0200
+++ linux-2.6.17-rc1-git5/drivers/block/aoe/aoechr.c 2006-04-12 13:50:11.000000000 +0200
@@ -162,7 +162,7 @@ aoechr_open(struct inode *inode, struct
{
int n, i;
- n = MINOR(inode->i_rdev);
+ n = iminor(inode);
filp->private_data = (void *) (unsigned long) n;
for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 5+ messages in thread* [KJ] [Patch] cleanup inode->r_dev usage in
2006-04-11 21:25 [KJ] [Patch] cleanup inode->r_dev usage in arch/cris Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in Eric Sesterhenn
@ 2006-04-12 14:58 ` Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in drivers/block/loop.c Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in arch/mips Eric Sesterhenn
3 siblings, 0 replies; 5+ messages in thread
From: Eric Sesterhenn @ 2006-04-12 14:58 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 2028 bytes --]
hi,
imajor()/iminor() should be used instead of accessing r_dev
directly. This patch cleans up drivers/isdn/i4l/isdn_common.c
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
--- linux-2.6.17-rc1-git5/drivers/isdn/i4l/isdn_common.c.orig 2006-04-12 13:51:12.000000000 +0200
+++ linux-2.6.17-rc1-git5/drivers/isdn/i4l/isdn_common.c 2006-04-12 13:52:19.000000000 +0200
@@ -1050,7 +1050,7 @@ isdn_info_update(void)
static ssize_t
isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
{
- uint minor = MINOR(file->f_dentry->d_inode->i_rdev);
+ uint minor = iminor(file->f_dentry->d_inode);
int len = 0;
int drvidx;
int chidx;
@@ -1154,7 +1154,7 @@ isdn_read(struct file *file, char __user
static ssize_t
isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
{
- uint minor = MINOR(file->f_dentry->d_inode->i_rdev);
+ uint minor = iminor(file->f_dentry->d_inode);
int drvidx;
int chidx;
int retval;
@@ -1217,7 +1217,7 @@ static unsigned int
isdn_poll(struct file *file, poll_table * wait)
{
unsigned int mask = 0;
- unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+ unsigned int minor = iminor(file->f_dentry->d_inode);
int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
lock_kernel();
@@ -1258,7 +1258,7 @@ isdn_poll(struct file *file, poll_table
static int
isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
{
- uint minor = MINOR(inode->i_rdev);
+ uint minor = iminor(inode);
isdn_ctrl c;
int drvidx;
int chidx;
@@ -1709,7 +1709,7 @@ isdn_ioctl(struct inode *inode, struct f
static int
isdn_open(struct inode *ino, struct file *filep)
{
- uint minor = MINOR(ino->i_rdev);
+ uint minor = iminor(ino);
int drvidx;
int chidx;
int retval = -ENODEV;
@@ -1771,7 +1771,7 @@ isdn_open(struct inode *ino, struct file
static int
isdn_close(struct inode *ino, struct file *filep)
{
- uint minor = MINOR(ino->i_rdev);
+ uint minor = iminor(ino);
lock_kernel();
if (minor == ISDN_MINOR_STATUS) {
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 5+ messages in thread* [KJ] [Patch] cleanup inode->r_dev usage in drivers/block/loop.c
2006-04-11 21:25 [KJ] [Patch] cleanup inode->r_dev usage in arch/cris Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in Eric Sesterhenn
2006-04-12 14:58 ` Eric Sesterhenn
@ 2006-04-12 14:58 ` Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in arch/mips Eric Sesterhenn
3 siblings, 0 replies; 5+ messages in thread
From: Eric Sesterhenn @ 2006-04-12 14:58 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
hi,
imajor()/iminor() should be used instead of accessing r_dev
directly. This patch cleans up drivers/block/loop.c
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
--- linux-2.6.17-rc1-git5/drivers/block/loop.c.orig 2006-04-12 13:50:23.000000000 +0200
+++ linux-2.6.17-rc1-git5/drivers/block/loop.c 2006-04-12 13:50:46.000000000 +0200
@@ -734,7 +734,7 @@ static inline int is_loop_device(struct
{
struct inode *i = file->f_mapping->host;
- return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
+ return i && S_ISBLK(i->i_mode) && imajor(i) == LOOP_MAJOR;
}
static int loop_set_fd(struct loop_device *lo, struct file *lo_file,
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 5+ messages in thread* [KJ] [Patch] cleanup inode->r_dev usage in arch/mips
2006-04-11 21:25 [KJ] [Patch] cleanup inode->r_dev usage in arch/cris Eric Sesterhenn
` (2 preceding siblings ...)
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in drivers/block/loop.c Eric Sesterhenn
@ 2006-04-12 14:58 ` Eric Sesterhenn
3 siblings, 0 replies; 5+ messages in thread
From: Eric Sesterhenn @ 2006-04-12 14:58 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 2627 bytes --]
hi,
imajor()/iminor() should be used instead of accessing r_dev
directly. This patch cleans up arch/mips
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
--- linux-2.6.17-rc1-git5/arch/mips/kernel/rtlx.c.orig 2006-04-12 13:47:29.000000000 +0200
+++ linux-2.6.17-rc1-git5/arch/mips/kernel/rtlx.c 2006-04-12 13:48:31.000000000 +0200
@@ -122,7 +122,7 @@ static int rtlx_open(struct inode *inode
struct rtlx_channel *chan;
/* assume only 1 device at the mo. */
- minor = MINOR(inode->i_rdev);
+ minor = iminor(inode);
if (rtlx == NULL) {
struct rtlx_info **p;
@@ -151,7 +151,7 @@ static int rtlx_open(struct inode *inode
static int rtlx_release(struct inode *inode, struct file *filp)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = iminor(inode);
clear_bit(RTLX_STATE_OPENED, &rtlx->channel[minor].lx_state);
smp_mb__after_clear_bit();
@@ -165,7 +165,7 @@ static unsigned int rtlx_poll(struct fil
unsigned int mask = 0;
struct rtlx_channel *chan;
- minor = MINOR(file->f_dentry->d_inode->i_rdev);
+ minor = iminor(file->f_dentry->d_inode);
chan = &rtlx->channel[minor];
poll_wait(file, &channel_wqs[minor].rt_queue, wait);
@@ -191,7 +191,7 @@ static ssize_t rtlx_read(struct file *fi
struct rtlx_channel *lx;
DECLARE_WAITQUEUE(wait, current);
- minor = MINOR(file->f_dentry->d_inode->i_rdev);
+ minor = iminor(file->f_dentry->d_inode);
lx = &rtlx->channel[minor];
/* data available? */
@@ -251,7 +251,7 @@ static ssize_t rtlx_write(struct file *f
size_t fl;
DECLARE_WAITQUEUE(wait, current);
- minor = MINOR(file->f_dentry->d_inode->i_rdev);
+ minor = iminor(file->f_dentry->d_inode);
rt = &rtlx->channel[minor];
/* any space left... */
--- linux-2.6.17-rc1-git5/arch/mips/kernel/vpe.c.orig 2006-04-12 13:48:38.000000000 +0200
+++ linux-2.6.17-rc1-git5/arch/mips/kernel/vpe.c 2006-04-12 13:49:11.000000000 +0200
@@ -941,7 +941,7 @@ static int vpe_open(struct inode *inode,
struct vpe *v;
/* assume only 1 device at the mo. */
- if ((minor = MINOR(inode->i_rdev)) != 1) {
+ if ((minor = iminor(inode)) != 1) {
printk(KERN_WARNING "VPE: only vpe1 is supported\n");
return -ENODEV;
}
@@ -995,7 +995,7 @@ static int vpe_release(struct inode *ino
struct vpe *v;
Elf_Ehdr *hdr;
- minor = MINOR(inode->i_rdev);
+ minor = iminor(inode);
if ((v = get_vpe(minor)) == NULL)
return -ENODEV;
@@ -1028,7 +1028,7 @@ static ssize_t vpe_write(struct file *fi
size_t ret = count;
struct vpe *v;
- minor = MINOR(file->f_dentry->d_inode->i_rdev);
+ minor = iminor(file->f_dentry->d_inode);
if ((v = get_vpe(minor)) == NULL)
return -ENODEV;
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-04-12 14:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-11 21:25 [KJ] [Patch] cleanup inode->r_dev usage in arch/cris Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in Eric Sesterhenn
2006-04-12 14:58 ` Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in drivers/block/loop.c Eric Sesterhenn
2006-04-12 14:58 ` [KJ] [Patch] cleanup inode->r_dev usage in arch/mips Eric Sesterhenn
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.