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

	the last kdev_t object is gone; ->i_rdev switched to dev_t.

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index a1888c4dc0d9f0562de5654a4aa4b3a72d40d576..8d1f8c6d3c23025efac5471da25be4e869bda781 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1295,7 +1295,7 @@ static int tty_open(struct inode * inode, struct file * filp)
        int noctty, retval;
        struct tty_driver *driver;
        int index;
-       dev_t device = kdev_t_to_nr(inode->i_rdev);
+       dev_t device = inode->i_rdev;
        unsigned short saved_flags = filp->f_flags;
 retry_open:
        noctty = filp->f_flags & O_NOCTTY;

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 5d0e4c662599cf5c736acf8885bdeb491df70ccc..aae61522d1f7ea577d4c4b2d1e5df09d3a66fd3e 100644 (file)
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -312,7 +312,7 @@ static int lookup_device(const char *path, dev_t *dev)
                goto out;
        }
 
-       *dev = kdev_t_to_nr(inode->i_rdev);
+       *dev = inode->i_rdev;
 
  out:
        path_release(&nd);

diff --git a/fs/block_dev.c b/fs/block_dev.c
index ddfcb6284b5a3a2063808a2aa8fd2f7aecb49d84..e08095251aab76e06c62875e3962d08477c6f6a4 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -345,7 +345,7 @@ struct block_device *bdget(dev_t dev)
                bdev->bd_part_count = 0;
                bdev->bd_invalidated = 0;
                inode->i_mode = S_IFBLK;
-               inode->i_rdev = to_kdev_t(dev);
+               inode->i_rdev = dev;
                inode->i_bdev = bdev;
                inode->i_data.a_ops = &def_blk_aops;
                mapping_set_gfp_mask(&inode->i_data, GFP_USER);
@@ -386,7 +386,7 @@ int bd_acquire(struct inode *inode)
                return 0;
        }
        spin_unlock(&bdev_lock);
-       bdev = bdget(kdev_t_to_nr(inode->i_rdev));
+       bdev = bdget(inode->i_rdev);
        if (!bdev)
                return -ENOMEM;
        spin_lock(&bdev_lock);

diff --git a/fs/char_dev.c b/fs/char_dev.c
index e41bf7caa5eeca2987a8514f7be9b7d5db8b4de2..44303f85e624ca8769962129bf4938740c403805 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -265,7 +265,7 @@ int chrdev_open(struct inode * inode, struct file * filp)
                struct kobject *kobj;
                int idx;
                spin_unlock(&cdev_lock);
-               kobj = kobj_lookup(cdev_map, kdev_t_to_nr(inode->i_rdev), &idx);
+               kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
                if (!kobj)
                        return -ENODEV;
                new = container_of(kobj, struct cdev, kobj);

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 247a39b899b3a357c566efd4ab0ed5b2daa32e84..5e223961e9fb908b7cd68db81ae6949f1ac17ea7 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1024,7 +1024,7 @@ fill_in_inode(struct inode *tmp_inode,
        } else {
                cFYI(1, (" Init special inode "));
                init_special_inode(tmp_inode, tmp_inode->i_mode,
-                                  kdev_t_to_nr(tmp_inode->i_rdev));
+                                  tmp_inode->i_rdev);
        }
 }
 
@@ -1094,7 +1094,7 @@ unix_fill_in_inode(struct inode *tmp_inode,
        } else {
                cFYI(1, (" Init special inode "));
                init_special_inode(tmp_inode, tmp_inode->i_mode,
-                                  kdev_t_to_nr(tmp_inode->i_rdev));
+                                  tmp_inode->i_rdev);
        }
 }
 

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 3625916ca3512d56372e9c51dbff9ab16ac6b310..6524d6d1f88331fbfb68698fb2e0487af6b83cdc 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -154,7 +154,7 @@ cifs_get_inode_info_unix(struct inode **pinode,
                } else {
                        cFYI(1, (" Init special inode "));
                        init_special_inode(inode, inode->i_mode,
-                                          kdev_t_to_nr(inode->i_rdev));
+                                          inode->i_rdev);
                }
        }
        FreeXid(xid);
@@ -298,7 +298,7 @@ cifs_get_inode_info(struct inode **pinode, const unsigned char *search_path,
                        inode->i_op = &cifs_symlink_inode_ops;
                } else {
                        init_special_inode(inode, inode->i_mode,
-                                          kdev_t_to_nr(inode->i_rdev));
+                                          inode->i_rdev);
                }
        }
        if(buf)

diff --git a/fs/devfs/base.c b/fs/devfs/base.c
index 3df3c5dc169719a0f3dc2b2d27c2fd32f34fec7e..fda21d6af987bb9f48f0722cb718397e78b0daff 100644 (file)
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -2012,11 +2012,11 @@ static struct inode *_devfs_get_vfs_inode (struct super_block *sb,
     inode->i_fop = &devfs_fops;
     if ( S_ISCHR (de->mode) )
     {
-       inode->i_rdev = to_kdev_t(de->u.cdev.dev);
+       inode->i_rdev = de->u.cdev.dev;
     }
     else if ( S_ISBLK (de->mode) )
     {
-       inode->i_rdev = to_kdev_t(de->u.bdev.dev);
+       inode->i_rdev = de->u.bdev.dev;
        if (bd_acquire (inode) != 0)
                PRINTK ("(%d): no block device from bdget()\n",(int)inode->i_ino);
     }

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 8a009a1594695ac441bebbfea679de3f9d336af4..c9d6cf4a3869600d9302f4ed2fe59a97fd1e6b1e 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1216,7 +1216,7 @@ static int ext2_update_inode(struct inode * inode, int do_sync)
        
        raw_inode->i_generation = cpu_to_le32(inode->i_generation);
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
-               raw_inode->i_block[0] = cpu_to_le32(kdev_t_to_nr(inode->i_rdev));
+               raw_inode->i_block[0] = cpu_to_le32(inode->i_rdev);
        else for (n = 0; n < EXT2_N_BLOCKS; n++)
                raw_inode->i_block[n] = ei->i_data[n];
        mark_buffer_dirty(bh);

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 84f41589a02a1be67e7b47d275c2d801a3541563..24bd9d1fc7de23697d68cc87c805d72ce01cfb83 100644 (file)
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -2668,7 +2668,7 @@ static int ext3_do_update_inode(handle_t *handle,
        raw_inode->i_generation = cpu_to_le32(inode->i_generation);
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
                raw_inode->i_block[0] =
-                       cpu_to_le32(kdev_t_to_nr(inode->i_rdev));
+                       cpu_to_le32(inode->i_rdev);
        else for (block = 0; block < EXT3_N_BLOCKS; block++)
                raw_inode->i_block[block] = ei->i_data[block];
 

diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index 2d4042ac2ae0cf4b2f4f9bdb8359c5c1ee851a89..94293028a9ec8c305ff438189b84f22be5fec4b3 100644 (file)
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c
@@ -225,7 +225,7 @@ void hpfs_write_inode_ea(struct inode *i, struct fnode *fnode)
                                hpfs_inode->i_ea_mode = 1;
                        }
                if (S_ISBLK(i->i_mode) || S_ISCHR(i->i_mode)) {
-                       int d = kdev_t_to_nr(i->i_rdev);
+                       dev_t d = i->i_rdev;
                        ea[0] = d & 0xff;
                        ea[1] = (d >> 8) & 0xff;
                        ea[2] = (d >> 16) & 0xff;

diff --git a/fs/inode.c b/fs/inode.c
index bd116dc1fadc71973d32ad36c74dee619267f72d..df29026f21c1ef15567c56cc69d3c814dee7d8fb 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -130,7 +130,7 @@ static struct inode *alloc_inode(struct super_block *sb)
                inode->i_pipe = NULL;
                inode->i_bdev = NULL;
                inode->i_cdev = NULL;
-               inode->i_rdev = to_kdev_t(0);
+               inode->i_rdev = 0;
                inode->i_security = NULL;
                if (security_inode_alloc(inode)) {
                        if (inode->i_sb->s_op->destroy_inode)
@@ -1363,10 +1363,10 @@ void init_special_inode(struct inode *inode, umode_t mode, dev_t rdev)
        inode->i_mode = mode;
        if (S_ISCHR(mode)) {
                inode->i_fop = &def_chr_fops;
-               inode->i_rdev = to_kdev_t(rdev);
+               inode->i_rdev = rdev;
        } else if (S_ISBLK(mode)) {
                inode->i_fop = &def_blk_fops;
-               inode->i_rdev = to_kdev_t(rdev);
+               inode->i_rdev = rdev;
        } else if (S_ISFIFO(mode))
                inode->i_fop = &def_fifo_fops;
        else if (S_ISSOCK(mode))

diff --git a/fs/intermezzo/vfs.c b/fs/intermezzo/vfs.c
index 920ba2773961aef9130004a062d6228761c4fafc..469a463c8752d7e9010548475770b546131f7f9d 100644 (file)
--- a/fs/intermezzo/vfs.c
+++ b/fs/intermezzo/vfs.c
@@ -290,7 +290,7 @@ int presto_settime(struct presto_file_set *fset,
 void izo_get_rollback_data(struct inode *inode, struct izo_rollback_data *rb)
 {
         rb->rb_mode = (__u32)inode->i_mode;
-        rb->rb_rdev = (__u32)kdev_t_to_nr(inode->i_rdev);
+        rb->rb_rdev = (__u32)inode->i_rdev;
         rb->rb_uid  = (__u64)inode->i_uid;
         rb->rb_gid  = (__u64)inode->i_gid;
 }

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index a28d5f174b9bfac722a25b1235f4d5f43f5e6a7a..bbff5798e2d30e24812313c9609cc6cdc5082f1b 100644 (file)
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -1329,8 +1329,7 @@ static void isofs_read_inode(struct inode * inode)
                inode->i_data.a_ops = &isofs_symlink_aops;
        } else
                /* XXX - parse_rock_ridge_inode() had already set i_rdev. */
-               init_special_inode(inode, inode->i_mode,
-                                  kdev_t_to_nr(inode->i_rdev));
+               init_special_inode(inode, inode->i_mode, inode->i_rdev);
 
  out:
        if (tmpde)

diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
index 8d66d202f04efb39ba8231fdb92b600f09ae08ee..ec218349feb126fcf110c93a0b0ec498f3564ef4 100644 (file)
--- a/fs/isofs/rock.c
+++ b/fs/isofs/rock.c
@@ -228,9 +228,9 @@ int parse_rock_ridge_inode_internal(struct iso_directory_record * de,
           * stored in the low field, and use that.
           */
          if((low & ~0xff) && high == 0) {
-           inode->i_rdev = mk_kdev(low >> 8, low & 0xff);
+           inode->i_rdev = MKDEV(low >> 8, low & 0xff);
          } else {
-           inode->i_rdev = mk_kdev(high, low);
+           inode->i_rdev = MKDEV(high, low);
          }
        }
        break;

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 8bc53c400875e8aad1a55fd1f9a9a00387ecb67e..991dcaf15c72ae7aea334c9844b777c993687b39 100644 (file)
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -174,7 +174,7 @@ static struct super_block *jffs2_get_sb(struct file_system_type *fs_type,
        int err;
        struct nameidata nd;
        int mtdnr;
-       kdev_t dev;
+       dev_t dev;
 
        if (!dev_name)
                return ERR_PTR(-EINVAL);
@@ -240,14 +240,14 @@ static struct super_block *jffs2_get_sb(struct file_system_type *fs_type,
        dev = nd.dentry->d_inode->i_rdev;
        path_release(&nd);
 
-       if (major(dev) != MTD_BLOCK_MAJOR) {
+       if (MAJOR(dev) != MTD_BLOCK_MAJOR) {
                if (!(flags & MS_VERBOSE)) /* Yes I mean this. Strangely */
                        printk(KERN_NOTICE "Attempt to mount non-MTD device \"%s\" as JFFS2\n",
                               dev_name);
                return ERR_PTR(-EINVAL);
        }
 
-       return jffs2_get_sb_mtdnr(fs_type, flags, dev_name, data, minor(dev));
+       return jffs2_get_sb_mtdnr(fs_type, flags, dev_name, data, MINOR(dev));
 }
 
 

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 4ad780e83e7362ee61369a870144e0cfdd865e82..989621a380b6aceca0a5932019111b9759856cb8 100644 (file)
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -61,8 +61,7 @@ void jfs_read_inode(struct inode *inode)
                        inode->i_op = &jfs_symlink_inode_operations;
        } else {
                inode->i_op = &jfs_file_inode_operations;
-               init_special_inode(inode, inode->i_mode,
-                                  kdev_t_to_nr(inode->i_rdev));
+               init_special_inode(inode, inode->i_mode, inode->i_rdev);
        }
 }
 

diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 847afd3030d89df0f4dfdd04526ca8e8283a4d62..7ee8f04862cc3ccebb0ec87d07dd73c1c2aef6c4 100644 (file)
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -3043,7 +3043,7 @@ static int copy_from_dinode(struct dinode * dip, struct inode *ip)
        jfs_ip->acltype = le32_to_cpu(dip->di_acltype);
 
        if (S_ISCHR(ip->i_mode) || S_ISBLK(ip->i_mode))
-               ip->i_rdev = to_kdev_t(le32_to_cpu(dip->di_rdev));
+               ip->i_rdev = le32_to_cpu(dip->di_rdev);
 
        if (S_ISDIR(ip->i_mode)) {
                memcpy(&jfs_ip->i_dirtable, &dip->di_dirtable, 384);
@@ -3102,7 +3102,7 @@ static void copy_to_dinode(struct dinode * dip, struct inode *ip)
        dip->di_acltype = cpu_to_le32(jfs_ip->acltype);
 
        if (S_ISCHR(ip->i_mode) || S_ISBLK(ip->i_mode))
-               dip->di_rdev = cpu_to_le32(kdev_t_to_nr(ip->i_rdev));
+               dip->di_rdev = cpu_to_le32(ip->i_rdev);
 }
 
 #ifdef _JFS_DEBUG_IMAP

diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 710e46886609d99b7027034a5b86a4d7033cfaa8..1c98d11037293f8a08cad9fdc889773763107c8a 100644 (file)
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -460,7 +460,7 @@ static struct buffer_head * V1_minix_update_inode(struct inode * inode)
        raw_inode->i_size = inode->i_size;
        raw_inode->i_time = inode->i_mtime.tv_sec;
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
-               raw_inode->i_zone[0] = kdev_t_to_nr(inode->i_rdev);
+               raw_inode->i_zone[0] = inode->i_rdev;
        else for (i = 0; i < 9; i++)
                raw_inode->i_zone[i] = minix_inode->u.i1_data[i];
        mark_buffer_dirty(bh);
@@ -489,7 +489,7 @@ static struct buffer_head * V2_minix_update_inode(struct inode * inode)
        raw_inode->i_atime = inode->i_atime.tv_sec;
        raw_inode->i_ctime = inode->i_ctime.tv_sec;
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
-               raw_inode->i_zone[0] = kdev_t_to_nr(inode->i_rdev);
+               raw_inode->i_zone[0] = inode->i_rdev;
        else for (i = 0; i < 10; i++)
                raw_inode->i_zone[i] = minix_inode->u.i2_data[i];
        mark_buffer_dirty(bh);

diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index b41f63972df75ffa1f5eab4a73ce6b04e89e5ecd..d0dda80f9c4771f35ff4cbd4ae10f54d1da344a1 100644 (file)
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -242,7 +242,7 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp,
                                case S_IFCHR:
                                case S_IFBLK:
                                        /* reserve rdev for later checking */
-                                       attr->ia_size = kdev_t_to_nr(inode->i_rdev);
+                                       attr->ia_size = inode->i_rdev;
                                        attr->ia_valid |= ATTR_SIZE;
 
                                        /* FALLTHROUGH */
@@ -300,7 +300,7 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp,
                /* Make sure the type and device matches */
                nfserr = nfserr_exist;
                if (inode && (type != (inode->i_mode & S_IFMT) || 
-                   (is_borc && kdev_t_to_nr(inode->i_rdev) != rdev)))
+                   (is_borc && inode->i_rdev != rdev)))
                        goto out_unlock;
        }
        

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 3f621de0ba228d10a04fe06ba25be1314ad9d41b..d18538e49f2124f6984aa7171dd83ff918ae2ee3 100644 (file)
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -1024,7 +1024,7 @@ static void inode2sd (void * sd, struct inode * inode)
     set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec );
     set_sd_v2_blocks(sd_v2, inode->i_blocks );
     if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
-       set_sd_v2_rdev(sd_v2, kdev_t_to_nr(inode->i_rdev) );
+       set_sd_v2_rdev(sd_v2, inode->i_rdev);
     else
        set_sd_v2_generation(sd_v2, inode->i_generation);
     flags = REISERFS_I(inode)->i_attrs;
@@ -1048,7 +1048,7 @@ static void inode2sd_v1 (void * sd, struct inode * inode)
     set_sd_v1_mtime(sd_v1, inode->i_mtime.tv_sec );
 
     if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
-        set_sd_v1_rdev(sd_v1, kdev_t_to_nr(inode->i_rdev) );
+        set_sd_v1_rdev(sd_v1, inode->i_rdev);
     else
         set_sd_v1_blocks(sd_v1, inode->i_blocks );
 

diff --git a/fs/stat.c b/fs/stat.c
index 7f034fa65d885014989a3151b75db8c01504cfb6..a1f3d7d874fae5d96e53c9cb02089454bfd1415d 100644 (file)
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -24,7 +24,7 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
        stat->nlink = inode->i_nlink;
        stat->uid = inode->i_uid;
        stat->gid = inode->i_gid;
-       stat->rdev = kdev_t_to_nr(inode->i_rdev);
+       stat->rdev = inode->i_rdev;
        stat->atime = inode->i_atime;
        stat->mtime = inode->i_mtime;
        stat->ctime = inode->i_ctime;

diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index 9a4564610aaeac537e169865262aa21c795b0d73..60fca21285670579a660d57b4f579b519147f853 100644 (file)
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -241,7 +241,7 @@ static struct buffer_head * sysv_update_inode(struct inode * inode)
 
        si = SYSV_I(inode);
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
-               si->i_data[0] = cpu_to_fs32(sbi, kdev_t_to_nr(inode->i_rdev));
+               si->i_data[0] = cpu_to_fs32(sbi, inode->i_rdev);
        for (block = 0; block < 10+1+1+1; block++)
                write3byte(sbi, (u8 *)&si->i_data[block],
                        &raw_inode->i_data[3*block]);

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 2fa65ab370d7068cd7c6054603dca171c8620878..1c2fba3d5655e4702ba5a35b8f30d7c573a2a5ee 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1392,8 +1392,8 @@ udf_update_inode(struct inode *inode, int do_sync)
                strcpy(eid->ident, UDF_ID_DEVELOPER);
                eid->identSuffix[0] = UDF_OS_CLASS_UNIX;
                eid->identSuffix[1] = UDF_OS_ID_LINUX;
-               dsea->majorDeviceIdent = kdev_t_to_nr(inode->i_rdev) >> 8;
-               dsea->minorDeviceIdent = kdev_t_to_nr(inode->i_rdev) & 0xFF;
+               dsea->majorDeviceIdent = inode->i_rdev >> 8;
+               dsea->minorDeviceIdent = inode->i_rdev & 0xFF;
                mark_buffer_dirty_inode(tbh, inode);
                udf_release_data(tbh);
        }

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 442c28e17739dcc1088af2de5936c81c98f9ac4a..f8c113bd3677b26e521a73bb87f3394299e4676e 100644 (file)
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -619,7 +619,7 @@ static int ufs_update_inode(struct inode * inode, int do_sync)
        }
 
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
-               ufs_inode->ui_u2.ui_addr.ui_db[0] = cpu_to_fs32(sb, kdev_t_to_nr(inode->i_rdev));
+               ufs_inode->ui_u2.ui_addr.ui_db[0] = cpu_to_fs32(sb, inode->i_rdev);
        else if (inode->i_blocks) {
                for (i = 0; i < (UFS_NDADDR + UFS_NINDIR); i++)
                        ufs_inode->ui_u2.ui_addr.ui_db[i] = ufsi->i_u1.i_data[i];

diff --git a/fs/xfs/linux/xfs_iops.c b/fs/xfs/linux/xfs_iops.c
index 11eac5784afa696174f5384ae1c97827a21da1ab..5f316085b1b9b61ace24a5703556b0b7afa7c493 100644 (file)
--- a/fs/xfs/linux/xfs_iops.c
+++ b/fs/xfs/linux/xfs_iops.c
@@ -178,7 +178,7 @@ linvfs_mknod(
                ip = LINVFS_GET_IP(vp);
 
                if (S_ISCHR(mode) || S_ISBLK(mode))
-                       ip->i_rdev = to_kdev_t(rdev);
+                       ip->i_rdev = rdev;
                else if (S_ISDIR(mode))
                        validate_fields(ip);
                d_instantiate(dentry, ip);

diff --git a/fs/xfs/linux/xfs_super.c b/fs/xfs/linux/xfs_super.c
index 49c173f9e5d032a84a9b829171636ef55fe5f99b..1bd4b3a4a60450b31307af49d9493d1f88d0d7e1 100644 (file)
--- a/fs/xfs/linux/xfs_super.c
+++ b/fs/xfs/linux/xfs_super.c
@@ -154,7 +154,7 @@ xfs_set_inodeops(
        } else {
                inode->i_op = &linvfs_file_inode_operations;
                init_special_inode(inode, inode->i_mode,
-                                       kdev_t_to_nr(inode->i_rdev));
+                                       inode->i_rdev);
        }
 }
 
@@ -171,7 +171,7 @@ xfs_revalidate_inode(
        inode->i_uid    = ip->i_d.di_uid;
        inode->i_gid    = ip->i_d.di_gid;
        if (((1 << vp->v_type) & ((1<<VBLK) | (1<<VCHR))) == 0) {
-               inode->i_rdev = NODEV;
+               inode->i_rdev = 0;
        } else {
                xfs_dev_t dev = ip->i_df.if_u2.if_rdev;
                inode->i_rdev = XFS_DEV_TO_KDEVT(dev);

diff --git a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h
index bdb7ca1419270c409a2b4aff9842411fde555acf..3c163b46160e6469288b86b0d9352078f6509ce5 100644 (file)
--- a/fs/xfs/xfs_types.h
+++ b/fs/xfs/xfs_types.h
@@ -210,6 +210,6 @@ typedef enum {
 #define XFS_MKDEV(major,minor) ((xfs_dev_t)(((major)<<XFS_DEV_BITSMINOR) \
                                    | (minor&XFS_DEV_MAXMIN)))
 
-#define XFS_DEV_TO_KDEVT(dev)  mk_kdev(XFS_DEV_MAJOR(dev),XFS_DEV_MINOR(dev))
+#define XFS_DEV_TO_KDEVT(dev)  MKDEV(XFS_DEV_MAJOR(dev),XFS_DEV_MINOR(dev))
 
 #endif /* !__XFS_TYPES_H */

diff --git a/fs/xfs/xfsidbg.c b/fs/xfs/xfsidbg.c
index 9d463a3e85cf749fb14d75d2aada1101ce5958d8..785c52cc23a57917fb443b031c82da400d8095b6 100644 (file)
--- a/fs/xfs/xfsidbg.c
+++ b/fs/xfs/xfsidbg.c
@@ -1687,7 +1687,7 @@ static void       printinode(struct inode *ip)
        kdb_printf(
                " i_mode = 0x%x  i_nlink = %d  i_rdev = 0x%x i_state = 0x%lx\n",
                                        ip->i_mode, ip->i_nlink,
-                                       kdev_t_to_nr(ip->i_rdev), ip->i_state);
+                                       ip->i_rdev, ip->i_state);
 
        kdb_printf(" i_hash.nxt = 0x%p i_hash.prv = 0x%p\n",
                                        ip->i_hash.next, ip->i_hash.prev);

diff --git a/include/linux/fs.h b/include/linux/fs.h
index fa2bd2dd7600a5e40d6d0b949dca85508d5b71d5..fe2bfd29580284878f88fd235544aa36b82e5401 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -373,7 +373,7 @@ struct inode {
        unsigned int            i_nlink;
        uid_t                   i_uid;
        gid_t                   i_gid;
-       kdev_t                  i_rdev;
+       dev_t                   i_rdev;
        loff_t                  i_size;
        struct timespec         i_atime;
        struct timespec         i_mtime;
@@ -469,12 +469,12 @@ static inline void i_size_write(struct inode *inode, loff_t i_size)
 
 static inline unsigned iminor(struct inode *inode)
 {
-       return minor(inode->i_rdev);
+       return MINOR(inode->i_rdev);
 }
 
 static inline unsigned imajor(struct inode *inode)
 {
-       return major(inode->i_rdev);
+       return MAJOR(inode->i_rdev);
 }
 
 struct fown_struct {