[PATCH] large dev_t - second series (1/15)

	misc trivial cleanups

diff --git a/arch/ia64/sn/io/hwgfs/ramfs.c b/arch/ia64/sn/io/hwgfs/ramfs.c
index 0ec5807cc73afe6825a2c79c5707f63e7a295444..5a112ccbfd272babc8a15253606ce8597c0ab754 100644 (file)
--- a/arch/ia64/sn/io/hwgfs/ramfs.c
+++ b/arch/ia64/sn/io/hwgfs/ramfs.c
@@ -56,7 +56,7 @@ static struct backing_dev_info hwgfs_backing_dev_info = {
        .memory_backed  = 1,    /* Does not contribute to dirty memory */
 };
 
-struct inode *hwgfs_get_inode(struct super_block *sb, int mode, dev_t dev)
+static struct inode *hwgfs_get_inode(struct super_block *sb, int mode, dev_t dev)
 {
        struct inode * inode = new_inode(sb);
 
@@ -66,7 +66,6 @@ struct inode *hwgfs_get_inode(struct super_block *sb, int mode, dev_t dev)
                inode->i_gid = current->fsgid;
                inode->i_blksize = PAGE_CACHE_SIZE;
                inode->i_blocks = 0;
-               inode->i_rdev = NODEV;
                inode->i_mapping->a_ops = &hwgfs_aops;
                inode->i_mapping->backing_dev_info = &hwgfs_backing_dev_info;
                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c
index 95152f2f2c65bd7a76ba6cef7312ed6d8bd54e4e..3e3531a38a133f4acef7d7dbb045e9a3c3b135e8 100644 (file)
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
@@ -34,12 +34,6 @@
 
 #include <linux/swapops.h>
 
-#ifdef CONFIG_STRAM_SWAP
-#define MAJOR_NR    Z2RAM_MAJOR
-#define do_z2_request do_stram_request
-#define DEVICE_NR(device) (minor(device))
-#endif
-
 #undef DEBUG
 
 #ifdef DEBUG

diff --git a/arch/ppc/platforms/pmac_setup.c b/arch/ppc/platforms/pmac_setup.c
index 15de29c7b58842c92533b362eee27dafa4ea2661..189e8d0d18b8b2b8277f325354f8f864cb45b90c 100644 (file)
--- a/arch/ppc/platforms/pmac_setup.c
+++ b/arch/ppc/platforms/pmac_setup.c
@@ -399,7 +399,7 @@ note_scsi_host(struct device_node *node, void *host)
 #endif
 
 #if defined(CONFIG_BLK_DEV_IDE) && defined(CONFIG_BLK_DEV_IDE_PMAC)
-dev_t __init
+static dev_t __init
 find_ide_boot(void)
 {
        char *p;

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 39fa46ec2db642c86b2cea8fede6078025e25918..0c3890b3ea127163310ea654a48323951e941afe 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -55,9 +55,6 @@ static int ubd_ioctl(struct inode * inode, struct file * file,
                     unsigned int cmd, unsigned long arg);
 
 #define MAX_DEV (8)
-#define MAX_MINOR (MAX_DEV << UBD_SHIFT)
-
-#define DEVICE_NR(n) (minor(n) >> UBD_SHIFT)
 
 static struct block_device_operations ubd_blops = {
         .owner         = THIS_MODULE,

diff --git a/drivers/base/map.c b/drivers/base/map.c
index 0fc8e3a10756ae70466aedc1e3e99aa2d3bcd7d4..af7ae91d8145614941baa2fe7561527ceadd8324 100644 (file)
--- a/drivers/base/map.c
+++ b/drivers/base/map.c
@@ -28,11 +28,6 @@ struct kobj_map {
        struct rw_semaphore *sem;
 };
 
-static inline int dev_to_index(dev_t dev)
-{
-       return MAJOR(dev) % 255;
-}
-
 int kobj_map(struct kobj_map *domain, dev_t dev, unsigned long range,
             struct module *module, kobj_probe_t *probe,
             int (*lock)(dev_t, void *), void *data)

diff --git a/drivers/block/DAC960.h b/drivers/block/DAC960.h
index 14b90438a30f8c4706f17a9d50ca414542fa845d..28fb52af3af4edacec4b08ef5f4d9fc61ca85ec9 100644 (file)
--- a/drivers/block/DAC960.h
+++ b/drivers/block/DAC960.h
@@ -2063,38 +2063,6 @@ extern int DAC960_KernelIOCTL(unsigned int Request, void *Argument);
 #define DAC960_MaxPartitions                   8
 #define DAC960_MaxPartitionsBits               3
 
-
-/*
-  Define macros to extract the Controller Number, Logical Drive Number, and
-  Partition Number from a Kernel Device, and to construct a Major Number, Minor
-  Number, and Kernel Device from the Controller Number, Logical Drive Number,
-  and Partition Number.  There is one Major Number assigned to each Controller.
-  The associated Minor Number is divided into the Logical Drive Number and
-  Partition Number.
-*/
-
-#define DAC960_ControllerNumber(Device) \
-  (major(Device) - DAC960_MAJOR)
-
-#define DAC960_LogicalDriveNumber(Device) \
-  (minor(Device) >> DAC960_MaxPartitionsBits)
-
-#define DAC960_MajorNumber(ControllerNumber) \
-  (DAC960_MAJOR + (ControllerNumber))
-
-#define DAC960_MinorNumber(LogicalDriveNumber, PartitionNumber) \
-   (((LogicalDriveNumber) << DAC960_MaxPartitionsBits) | (PartitionNumber))
-
-#define DAC960_MinorCount                      (DAC960_MaxLogicalDrives \
-                                                * DAC960_MaxPartitions)
-
-#define DAC960_KernelDevice(ControllerNumber,                                 \
-                           LogicalDriveNumber,                                \
-                           PartitionNumber)                                   \
-   mk_kdev(DAC960_MajorNumber(ControllerNumber),                                      \
-        DAC960_MinorNumber(LogicalDriveNumber, PartitionNumber))
-
-
 /*
   Define the DAC960 Controller fixed Block Size and Block Size Bits.
 */

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index b410b22f907ef719aff0d90e89e664fb1068b870..2cfca61b9801de805a1bc3a99e76c1f048e8993a 100644 (file)
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -158,10 +158,6 @@
 /** \name Backward compatibility section */
 /*@{*/
 
-#ifndef minor
-#define minor(x) MINOR((x))
-#endif
-
 #ifndef MODULE_LICENSE
 #define MODULE_LICENSE(x) 
 #endif

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 4275bb8521f091899cb0f19cf30ae6593df14137..8f969928c68be689ffff83126073e74119589873 100644 (file)
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -1460,17 +1460,6 @@ static int rp_ioctl(struct tty_struct *tty, struct file *file,
        return 0;
 }
 
-#if (defined(ROCKET_DEBUG_FLOW) || defined(ROCKET_DEBUG_THROTTLE))
-static char *rp_tty_name(struct tty_struct *tty, char *buf)
-{
-       if (tty)
-               sprintf(buf, "%s%d", TTY_DRIVER_NAME(tty), MINOR(tty->device) - TTY_DRIVER_MINOR_START(tty) + TTY_DRIVER_NAME_BASE);
-       else
-               strcpy(buf, "NULL tty");
-       return buf;
-}
-#endif
-
 static void rp_send_xchar(struct tty_struct *tty, char ch)
 {
        struct r_port *info = (struct r_port *) tty->driver_data;
@@ -1490,10 +1479,9 @@ static void rp_throttle(struct tty_struct *tty)
 {
        struct r_port *info = (struct r_port *) tty->driver_data;
        CHANNEL_t *cp;
-#ifdef ROCKET_DEBUG_THROTTLE
-       char buf[64];
 
-       printk(KERN_INFO "throttle %s: %d....\n", rp_tty_name(tty, buf),
+#ifdef ROCKET_DEBUG_THROTTLE
+       printk(KERN_INFO "throttle %s: %d....\n", tty->name,
               tty->ldisc.chars_in_buffer(tty));
 #endif
 
@@ -1512,9 +1500,7 @@ static void rp_unthrottle(struct tty_struct *tty)
        struct r_port *info = (struct r_port *) tty->driver_data;
        CHANNEL_t *cp;
 #ifdef ROCKET_DEBUG_THROTTLE
-       char buf[64];
-
-       printk(KERN_INFO "unthrottle %s: %d....\n", rp_tty_name(tty, buf),
+       printk(KERN_INFO "unthrottle %s: %d....\n", tty->name,
               tty->ldisc.chars_in_buffer(tty));
 #endif
 
@@ -1539,10 +1525,9 @@ static void rp_unthrottle(struct tty_struct *tty)
 static void rp_stop(struct tty_struct *tty)
 {
        struct r_port *info = (struct r_port *) tty->driver_data;
-#ifdef ROCKET_DEBUG_FLOW
-       char buf[64];
 
-       printk(KERN_INFO "stop %s: %d %d....\n", rp_tty_name(tty, buf),
+#ifdef ROCKET_DEBUG_FLOW
+       printk(KERN_INFO "stop %s: %d %d....\n", tty->name,
               info->xmit_cnt, info->xmit_fifo_room);
 #endif
 
@@ -1556,10 +1541,9 @@ static void rp_stop(struct tty_struct *tty)
 static void rp_start(struct tty_struct *tty)
 {
        struct r_port *info = (struct r_port *) tty->driver_data;
-#ifdef ROCKET_DEBUG_FLOW
-       char buf[64];
 
-       printk(KERN_INFO "start %s: %d %d....\n", rp_tty_name(tty, buf),
+#ifdef ROCKET_DEBUG_FLOW
+       printk(KERN_INFO "start %s: %d %d....\n", tty->name,
               info->xmit_cnt, info->xmit_fifo_room);
 #endif
 

diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index 660f7b0f148704390d0b7c49b8aa7d998b41d497..fc1558cab6e0a3cd8f050b323b20984da89696c4 100644 (file)
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -74,7 +74,6 @@
 
 #define VERSION(ver,rel,seq) (((ver)<<16) | ((rel)<<8) | (seq))
 #if LINUX_VERSION_CODE < VERSION(2,5,0)
-# define minor(x) MINOR(x)
 # define need_resched() (current->need_resched)
 #endif
 

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index aab1780082fcd334ce4ec07d4732a6abce1f7aaf..5b4693c5f9907475c33b40f3bf9928273d48696d 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2140,7 +2140,7 @@ error:
        kfree(tty_dev);
 }
 
-void tty_remove_class_device(dev_t dev)
+static void tty_remove_class_device(dev_t dev)
 {
        struct tty_dev *tty_dev = NULL;
        struct list_head *tmp;
@@ -2149,19 +2149,15 @@ void tty_remove_class_device(dev_t dev)
        spin_lock(&tty_dev_list_lock);
        list_for_each (tmp, &tty_dev_list) {
                tty_dev = list_entry(tmp, struct tty_dev, node);
-               if ((MAJOR(tty_dev->dev) == MAJOR(dev)) &&
-                   (MINOR(tty_dev->dev) == MINOR(dev))) {
+               if (tty_dev->dev == dev) {
+                       list_del(&tty_dev->node);
                        found = 1;
                        break;
                }
        }
-       if (found) {
-               list_del(&tty_dev->node);
-               spin_unlock(&tty_dev_list_lock);
+       spin_unlock(&tty_dev_list_lock);
+       if (found)
                class_device_unregister(&tty_dev->class_dev);
-       } else {
-               spin_unlock(&tty_dev_list_lock);
-       }
 }
 
 /**

diff --git a/drivers/ieee1394/ieee1394_types.h b/drivers/ieee1394/ieee1394_types.h
index e2e8ec8d78a575ba19b411b0bbb5339b04e1a6d0..60efa9ec9a0745e6ef77309f9e79ee95366fcff1 100644 (file)
--- a/drivers/ieee1394/ieee1394_types.h
+++ b/drivers/ieee1394/ieee1394_types.h
@@ -16,10 +16,6 @@
 
 /* The great kdev_t changeover in 2.5.x */
 #include <linux/kdev_t.h>
-#ifndef minor
-#define minor(dev) MINOR(dev)
-#endif
-
 
 /* Transaction Label handling */
 struct hpsb_tlabel_pool {

diff --git a/drivers/md/dm-ioctl-v1.c b/drivers/md/dm-ioctl-v1.c
index 3afe5e55ae66dd1decffa29f6c6178724060bd7e..0dc24d76de3f379d3b8faac5995232e219cea347 100644 (file)
--- a/drivers/md/dm-ioctl-v1.c
+++ b/drivers/md/dm-ioctl-v1.c
@@ -577,7 +577,7 @@ static int create(struct dm_ioctl *param, struct dm_ioctl *user)
        }
 
        if (param->flags & DM_PERSISTENT_DEV_FLAG)
-               r = dm_create_with_minor(minor(to_kdev_t(param->dev)), &md);
+               r = dm_create_with_minor(MINOR(param->dev), &md);
        else
                r = dm_create(&md);
 

diff --git a/drivers/md/dm-ioctl-v4.c b/drivers/md/dm-ioctl-v4.c
index 2c8243aab6f531cf40b5e116f1688f1a1b8eba66..0ea9a58b8daf15d05a6ad184af0ce2aebd27c0f0 100644 (file)
--- a/drivers/md/dm-ioctl-v4.c
+++ b/drivers/md/dm-ioctl-v4.c
@@ -481,7 +481,7 @@ static int dev_create(struct dm_ioctl *param, size_t param_size)
                return r;
 
        if (param->flags & DM_PERSISTENT_DEV_FLAG)
-               r = dm_create_with_minor(minor(to_kdev_t(param->dev)), &md);
+               r = dm_create_with_minor(MINOR(param->dev), &md);
        else
                r = dm_create(&md);
 

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 9da446a143ec57e9e8a16e1817814f3a84e81ddb..322782c4cda265cd71e6c08d4efbce4a56fd5f2e 100644 (file)
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -25,7 +25,6 @@
 #define MAJOR_NR MD_MAJOR
 #define MD_DRIVER
 #define MD_PERSONALITY
-#define DEVICE_NR(device) (minor(device))
 
 /*
  * find which device holds a particular offset 

diff --git a/drivers/md/md.c b/drivers/md/md.c
index b95a323cdf41bfd549152585c132bef2cd8515af..6a67e10393e2bd72e8d9ac286d4296a511df77a9 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -50,7 +50,6 @@
 
 #define MAJOR_NR MD_MAJOR
 #define MD_DRIVER
-#define DEVICE_NR(device) (minor(device))
 
 #define DEBUG 0
 #define dprintk(x...) ((void)(DEBUG && printk(x)))

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 4d19a4bd68089598f4546fd38cea75830d02af73..afa7e3e87b2168c1a85de4f92127f8e9f218e047 100644 (file)
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -29,7 +29,6 @@
 #define MAJOR_NR MD_MAJOR
 #define MD_DRIVER
 #define MD_PERSONALITY
-#define DEVICE_NR(device) (minor(device))
 
 #define MAX_WORK_PER_DISK 128
 

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index eb4368751307c6b7ee4944901fb918b3f4b9b420..ad7a468c683176342c8152185a264341174eea3c 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -24,7 +24,6 @@
 #define MAJOR_NR MD_MAJOR
 #define MD_DRIVER
 #define MD_PERSONALITY
-#define DEVICE_NR(device) (minor(device))
 
 static int create_strip_zones (mddev_t *mddev)
 {

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index cb7acbfb87cf7dec5803a7f1a8893e67f07e701f..83533c2629865ae1bd3637b947c85c0aec69c689 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -27,7 +27,6 @@
 #define MAJOR_NR MD_MAJOR
 #define MD_DRIVER
 #define MD_PERSONALITY
-#define DEVICE_NR(device) (minor(device))
 
 /*
  * Number of guaranteed r1bios in case of extreme VM load:

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 777f59a1f6c90727d79eda7eb07f34f399956a48..e7d60fcfbb12c4e82b872878dbee2c2510589089 100644 (file)
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -52,7 +52,7 @@ static ssize_t show_dev(struct class_device *cd, char *buf)
 {
        struct video_device *vfd = container_of(cd, struct video_device, class_dev);
        dev_t dev = MKDEV(VIDEO_MAJOR, vfd->minor);
-       return sprintf(buf,"%04x\n",(int)dev);
+       return sprintf(buf,"%04x\n",old_encode_dev(dev));
 }
 
 static CLASS_DEVICE_ATTR(name, S_IRUGO, show_name, NULL);

diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index bd5b10bbc08d91fb178334d1725ad15c5557398a..6cc67f746eb20c7cf7c5e788f2f7c9a9a588486b 100644 (file)
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -1265,7 +1265,7 @@ static int
 zoran_open (struct inode *inode,
            struct file  *file)
 {
-       unsigned int minor = minor(inode->i_rdev);
+       unsigned int minor = iminor(inode);
        struct zoran *zr = NULL;
        struct zoran_fh *fh;
        int i, res, first_open = 0, have_module_locks = 0;

diff --git a/drivers/s390/char/tubio.h b/drivers/s390/char/tubio.h
index 92cd4fe8dbd100bb08d13e194671589625717606..cd04879e404811efba3ab0cff70f2696f506f659 100644 (file)
--- a/drivers/s390/char/tubio.h
+++ b/drivers/s390/char/tubio.h
@@ -158,7 +158,6 @@ enum tubwhat {          /* echo what= proc actions */
 
 
 #define TUBMAXMINS      256
-#define TUB_DEV MKDEV(IBM_FS3270_MAJ, 0)        /* Generic /dev/3270/tub */
 #define _GEOM_ROWS 24
 #define _GEOM_COLS 80
 #define GEOM_ROWS (tubp->geom_rows)
@@ -294,23 +293,6 @@ typedef struct tub_s {
 #define        TUB_UE_BUSY     0x0800
 #define        TUB_INPUT_HACK  0x1000          /* Early init of command line */
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0))
-#define        S390_CONSOLE_DEV MKDEV(TTY_MAJOR, 64)
-#define tub_major(x) MAJOR(x)
-#define tub_minor(x) MINOR(x)
-#define tub_mkdev(x, y) MKDEV(x, y)
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#define        S390_CONSOLE_DEV MKDEV(TTYAUX_MAJOR, 1)
-#define tub_major(x) MAJOR(x)
-#define tub_minor(x) MINOR(x)
-#define tub_mkdev(x, y) MKDEV(x, y)
-#else
-#define S390_CONSOLE_DEV mk_kdev(TTYAUX_MAJOR, 1)
-#define tub_major(x) major(x)
-#define tub_minor(x) minor(x)
-#define tub_mkdev(x, y) mk_kdev(x, y)
-#endif
-
 /*
  * Extra stuff for 3270 console support
  */

diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 870900b513dafa4f17c0b321a5427996dfa7bcd9..8474deb3f277bfb531588c5dd5bc953e4ec33663 100644 (file)
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -152,7 +152,6 @@ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, dev_t de
                inode->i_gid = current->fsgid;
                inode->i_blksize = PAGE_CACHE_SIZE;
                inode->i_blocks = 0;
-               inode->i_rdev = NODEV;
                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
                switch (mode & S_IFMT) {
                default:

diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index a58e32b26acbdbc8e6515f3f2e507b5406365e4e..1c83000f2c3d7b107a4af8b6f2a85cd7a8d3bf1e 100644 (file)
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -68,7 +68,6 @@ static int afs_inode_map_status(afs_vnode_t *vnode)
        inode->i_nlink          = vnode->status.nlink;
        inode->i_uid            = vnode->status.owner;
        inode->i_gid            = 0;
-       inode->i_rdev           = NODEV;
        inode->i_size           = vnode->status.size;
        inode->i_atime.tv_sec           = inode->i_mtime.tv_sec = inode->i_ctime.tv_sec = vnode->status.mtime_server;
        inode->i_atime.tv_nsec = 

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 090a7e961c083b8cb652e36d9ecb39188e2def2f..35647d8eca944a6e10c71dda5f3754330eb8d8d8 100644 (file)
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -298,7 +298,6 @@ struct inode *autofs4_get_inode(struct super_block *sb,
        }
        inode->i_blksize = PAGE_CACHE_SIZE;
        inode->i_blocks = 0;
-       inode->i_rdev = NODEV;
        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 
        if (S_ISDIR(inf->mode)) {

diff --git a/fs/devfs/base.c b/fs/devfs/base.c
index 69a91269e0e9d2334b51f4aba58f763422ff92f1..3df3c5dc169719a0f3dc2b2d27c2fd32f34fec7e 100644 (file)
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -2010,7 +2010,6 @@ static struct inode *_devfs_get_vfs_inode (struct super_block *sb,
     inode->i_blksize = FAKE_BLOCK_SIZE;
     inode->i_op = &devfs_iops;
     inode->i_fop = &devfs_fops;
-    inode->i_rdev = NODEV;
     if ( S_ISCHR (de->mode) )
     {
        inode->i_rdev = to_kdev_t(de->u.cdev.dev);
@@ -2494,8 +2493,8 @@ static int devfs_mknod (struct inode *dir, struct dentry *dentry, int mode,
     struct devfs_entry *parent, *de;
     struct inode *inode;
 
-    DPRINTK (DEBUG_I_MKNOD, "(%s): mode: 0%o  dev: %d\n",
-            dentry->d_name.name, mode, rdev);
+    DPRINTK (DEBUG_I_MKNOD, "(%s): mode: 0%o  dev: %u:%u\n",
+            dentry->d_name.name, mode, MAJOR(rdev), MINOR(rdev));
     parent = get_devfs_entry_from_vfs_inode (dir);
     if (parent == NULL) return -ENOENT;
     de = _devfs_alloc_entry (dentry->d_name.name, dentry->d_name.len, mode);

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 21f14fcf8ccf6749c74e2c667a27257bc3e095cf..398de286c3e73dd45ff7f75165db44138b3e839a 100644 (file)
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -322,7 +322,6 @@ struct inode *hfs_iget(struct hfs_cat_entry *entry, ino_t type,
                /* Initialize the inode */
                struct hfs_sb_info *hsb = HFS_SB(sb);
 
-               inode->i_rdev = NODEV;
                inode->i_ctime.tv_sec = inode->i_atime.tv_sec = inode->i_mtime.tv_sec =
                                        hfs_m_to_utime(entry->modify_date);
                inode->i_ctime.tv_nsec = 0;

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 7b196a5024ae40a0c29338646cc0a876a18b55b2..effaa5bc5a9658d436c0a8266f3e9fabbda435b0 100644 (file)
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -406,7 +406,6 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, uid_t uid,
                inode->i_gid = gid;
                inode->i_blksize = HPAGE_SIZE;
                inode->i_blocks = 0;
-               inode->i_rdev = NODEV;
                inode->i_mapping->a_ops = &hugetlbfs_aops;
                inode->i_mapping->backing_dev_info =&hugetlbfs_backing_dev_info;
                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index 77b102d652990af46bedfe32a84db563418e7fa0..480a5ba41972bbd23b5cbe20517d3186939eee9c 100644 (file)
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -362,7 +362,6 @@ jffs_new_inode(const struct inode * dir, struct jffs_raw_inode *raw_inode,
        inode->i_nlink = raw_inode->nlink;
        inode->i_uid = raw_inode->uid;
        inode->i_gid = raw_inode->gid;
-       inode->i_rdev = NODEV;
        inode->i_size = raw_inode->dsize;
        inode->i_atime.tv_sec = raw_inode->atime;
        inode->i_mtime.tv_sec = raw_inode->mtime;

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 4c43d597d0aabbbc1dfa7bdc78cb58f056da3df7..88464374eaf166d3f1b7c7fe37b0d5246a148ff7 100644 (file)
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -147,7 +147,7 @@ void jffs2_read_inode (struct inode *inode)
        case S_IFSOCK:
        case S_IFIFO:
                inode->i_op = &jffs2_file_inode_operations;
-               init_special_inode(inode, inode->i_mode, kdev_t_to_nr(mk_kdev(je16_to_cpu(rdev)>>8, je16_to_cpu(rdev)&0xff)));
+               init_special_inode(inode, inode->i_mode, MKDEV(je16_to_cpu(rdev)>>8, je16_to_cpu(rdev)&0xff));
                break;
 
        default:

diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 70eab796137796e94af52ded54e0e92aac910a84..d0bd5276de564a4f04eaf2ff474ae7e1045a3d67 100644 (file)
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -220,7 +220,6 @@ static void ncp_set_attr(struct inode *inode, struct ncp_entry_info *nwinfo)
        inode->i_nlink = 1;
        inode->i_uid = server->m.uid;
        inode->i_gid = server->m.gid;
-       inode->i_rdev = NODEV;
        inode->i_blksize = NCP_BLOCK_SIZE;
 
        ncp_update_dates(inode, &nwinfo->i);

diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index 362ee3135e69cc02fcdccbff9639fe033d0d21ea..267691bb517423a01a245305875df410ca38bffd 100644 (file)
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -58,7 +58,6 @@ static struct inode *ramfs_get_inode(struct super_block *sb, int mode, dev_t dev
                inode->i_gid = current->fsgid;
                inode->i_blksize = PAGE_CACHE_SIZE;
                inode->i_blocks = 0;
-               inode->i_rdev = NODEV;
                inode->i_mapping->a_ops = &ramfs_aops;
                inode->i_mapping->backing_dev_info = &ramfs_backing_dev_info;
                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c
index 24cd428a521e434af18a6acbf66fb70bdef6eb16..80b17af9bb0d33deb3c1ea368883ea820d9f53dd 100644 (file)
--- a/fs/romfs/inode.c
+++ b/fs/romfs/inode.c
@@ -542,10 +542,8 @@ romfs_read_inode(struct inode *i)
                default:
                        /* depending on MBZ for sock/fifos */
                        nextfh = ntohl(ri.spec);
-                       /* convert back and forth for typechecking and
-                        * source tagging */
-                       nextfh = kdev_t_to_nr(mk_kdev(nextfh>>16,nextfh&0xffff));
-                       init_special_inode(i, ino, nextfh);
+                       init_special_inode(i, ino,
+                                       MKDEV(nextfh>>16,nextfh&0xffff));
        }
 }
 

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index c22313b1fa7aa2d08c0a547c202a2e38145b1514..965b5e9eaba12492a4261e2ecd65410a1876e26b 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -33,7 +33,6 @@ struct inode * sysfs_new_inode(mode_t mode)
                inode->i_gid = current->fsgid;
                inode->i_blksize = PAGE_CACHE_SIZE;
                inode->i_blocks = 0;
-               inode->i_rdev = NODEV;
                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
                inode->i_mapping->a_ops = &sysfs_aops;
                inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info;

diff --git a/mm/shmem.c b/mm/shmem.c
index a106bfec7709af318fb31a86828cb9e869e0713d..bb429eee7ebdbc4a5201f9bb4a8b325d48456596 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1040,7 +1040,6 @@ shmem_get_inode(struct super_block *sb, int mode, dev_t dev)
                inode->i_gid = current->fsgid;
                inode->i_blksize = PAGE_CACHE_SIZE;
                inode->i_blocks = 0;
-               inode->i_rdev = NODEV;
                inode->i_mapping->a_ops = &shmem_aops;
                inode->i_mapping->backing_dev_info = &shmem_backing_dev_info;
                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;