All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Sesterhenn <snakebyte@gmx.de>
To: kernel-janitors@vger.kernel.org
Subject: [KJ] [Patch] cleanup inode->r_dev usage in arch/mips
Date: Wed, 12 Apr 2006 14:58:37 +0000	[thread overview]
Message-ID: <1144853917.7840.12.camel@alice> (raw)
In-Reply-To: <1144790741.13849.2.camel@alice>

[-- 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

      parent reply	other threads:[~2006-04-12 14:58 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 ` Eric Sesterhenn [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1144853917.7840.12.camel@alice \
    --to=snakebyte@gmx.de \
    --cc=kernel-janitors@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.