Advertisement
Front, Kernel, Security, Distributions, Development. See your byline here on LWN.net.
| |||||||||||||
[PATCH] large dev_t - second series (7/15)
ChangeSet 1.1481, 2003/09/05 10:54:08-07:00, viro@www.linux.org.uk
[PATCH] large dev_t - second series (7/15)
the last kdev_t object is gone; ->i_rdev switched to dev_t.
# This patch includes the following deltas:
# ChangeSet 1.1480 -> 1.1481
# fs/jfs/inode.c 1.35 -> 1.36
# fs/cifs/file.c 1.31 -> 1.32
# fs/cifs/inode.c 1.24 -> 1.25
# fs/sysv/inode.c 1.28 -> 1.29
# fs/ext2/inode.c 1.67 -> 1.68
# fs/jfs/jfs_imap.c 1.23 -> 1.24
# fs/devfs/base.c 1.101 -> 1.102
# fs/stat.c 1.21 -> 1.22
# fs/ufs/inode.c 1.19 -> 1.20
# fs/xfs/xfs_types.h 1.7 -> 1.8
# include/linux/fs.h 1.270 -> 1.271
# fs/hpfs/inode.c 1.15 -> 1.16
# fs/reiserfs/inode.c 1.82 -> 1.83
# fs/intermezzo/vfs.c 1.25 -> 1.26
# fs/char_dev.c 1.23 -> 1.24
# fs/xfs/linux/xfs_iops.c 1.32 -> 1.33
# fs/nfsd/nfsproc.c 1.25 -> 1.26
# fs/jffs2/super.c 1.24 -> 1.25
# fs/minix/inode.c 1.36 -> 1.37
# fs/isofs/rock.c 1.15 -> 1.16
# drivers/char/tty_io.c 1.118 -> 1.119
# fs/ext3/inode.c 1.82 -> 1.83
# fs/xfs/xfsidbg.c 1.30 -> 1.31
# fs/xfs/linux/xfs_super.c 1.58 -> 1.59
# fs/isofs/inode.c 1.34 -> 1.35
# drivers/md/dm-table.c 1.21 -> 1.22
# fs/inode.c 1.104 -> 1.105
# fs/block_dev.c 1.142 -> 1.143
# fs/udf/inode.c 1.31 -> 1.32
#
drivers/char/tty_io.c | 2 +-
drivers/md/dm-table.c | 2 +-
fs/block_dev.c | 4 ++--
fs/char_dev.c | 2 +-
fs/cifs/file.c | 4 ++--
fs/cifs/inode.c | 4 ++--
fs/devfs/base.c | 4 ++--
fs/ext2/inode.c | 2 +-
fs/ext3/inode.c | 2 +-
fs/hpfs/inode.c | 2 +-
fs/inode.c | 6 +++---
fs/intermezzo/vfs.c | 2 +-
fs/isofs/inode.c | 3 +--
fs/isofs/rock.c | 4 ++--
fs/jffs2/super.c | 6 +++---
fs/jfs/inode.c | 3 +--
fs/jfs/jfs_imap.c | 4 ++--
fs/minix/inode.c | 4 ++--
fs/nfsd/nfsproc.c | 4 ++--
fs/reiserfs/inode.c | 4 ++--
fs/stat.c | 2 +-
fs/sysv/inode.c | 2 +-
fs/udf/inode.c | 4 ++--
fs/ufs/inode.c | 2 +-
fs/xfs/linux/xfs_iops.c | 2 +-
fs/xfs/linux/xfs_super.c | 4 ++--
fs/xfs/xfs_types.h | 2 +-
fs/xfs/xfsidbg.c | 2 +-
include/linux/fs.h | 6 +++---
29 files changed, 46 insertions(+), 48 deletions(-)
diff -Nru a/drivers/char/tty_io.c b/drivers/char/tty_io.c
--- a/drivers/char/tty_io.c Fri Sep 5 13:16:12 2003
+++ b/drivers/char/tty_io.c Fri Sep 5 13:16:12 2003
@@ -1295,7 +1295,7 @@
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 -Nru a/drivers/md/dm-table.c b/drivers/md/dm-table.c
--- a/drivers/md/dm-table.c Fri Sep 5 13:16:13 2003
+++ b/drivers/md/dm-table.c Fri Sep 5 13:16:13 2003
@@ -312,7 +312,7 @@
goto out;
}
- *dev = kdev_t_to_nr(inode->i_rdev);
+ *dev = inode->i_rdev;
out:
path_release(&nd);
diff -Nru a/fs/block_dev.c b/fs/block_dev.c
--- a/fs/block_dev.c Fri Sep 5 13:16:13 2003
+++ b/fs/block_dev.c Fri Sep 5 13:16:13 2003
@@ -345,7 +345,7 @@
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 @@
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 -Nru a/fs/char_dev.c b/fs/char_dev.c
--- a/fs/char_dev.c Fri Sep 5 13:16:12 2003
+++ b/fs/char_dev.c Fri Sep 5 13:16:12 2003
@@ -265,7 +265,7 @@
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 -Nru a/fs/cifs/file.c b/fs/cifs/file.c
--- a/fs/cifs/file.c Fri Sep 5 13:16:12 2003
+++ b/fs/cifs/file.c Fri Sep 5 13:16:12 2003
@@ -1024,7 +1024,7 @@
} 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 @@
} 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 -Nru a/fs/cifs/inode.c b/fs/cifs/inode.c
--- a/fs/cifs/inode.c Fri Sep 5 13:16:12 2003
+++ b/fs/cifs/inode.c Fri Sep 5 13:16:12 2003
@@ -154,7 +154,7 @@
} 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 @@
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 -Nru a/fs/devfs/base.c b/fs/devfs/base.c
--- a/fs/devfs/base.c Fri Sep 5 13:16:12 2003
+++ b/fs/devfs/base.c Fri Sep 5 13:16:12 2003
@@ -2012,11 +2012,11 @@
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 -Nru a/fs/ext2/inode.c b/fs/ext2/inode.c
--- a/fs/ext2/inode.c Fri Sep 5 13:16:12 2003
+++ b/fs/ext2/inode.c Fri Sep 5 13:16:12 2003
@@ -1216,7 +1216,7 @@
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 -Nru a/fs/ext3/inode.c b/fs/ext3/inode.c
--- a/fs/ext3/inode.c Fri Sep 5 13:16:13 2003
+++ b/fs/ext3/inode.c Fri Sep 5 13:16:13 2003
@@ -2668,7 +2668,7 @@
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 -Nru a/fs/hpfs/inode.c b/fs/hpfs/inode.c
--- a/fs/hpfs/inode.c Fri Sep 5 13:16:12 2003
+++ b/fs/hpfs/inode.c Fri Sep 5 13:16:12 2003
@@ -225,7 +225,7 @@
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 -Nru a/fs/inode.c b/fs/inode.c
--- a/fs/inode.c Fri Sep 5 13:16:13 2003
+++ b/fs/inode.c Fri Sep 5 13:16:13 2003
@@ -130,7 +130,7 @@
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 @@
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 -Nru a/fs/intermezzo/vfs.c b/fs/intermezzo/vfs.c
--- a/fs/intermezzo/vfs.c Fri Sep 5 13:16:12 2003
+++ b/fs/intermezzo/vfs.c Fri Sep 5 13:16:12 2003
@@ -290,7 +290,7 @@
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 -Nru a/fs/isofs/inode.c b/fs/isofs/inode.c
--- a/fs/isofs/inode.c Fri Sep 5 13:16:13 2003
+++ b/fs/isofs/inode.c Fri Sep 5 13:16:13 2003
@@ -1329,8 +1329,7 @@
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 -Nru a/fs/isofs/rock.c b/fs/isofs/rock.c
--- a/fs/isofs/rock.c Fri Sep 5 13:16:12 2003
+++ b/fs/isofs/rock.c Fri Sep 5 13:16:12 2003
@@ -228,9 +228,9 @@
* 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 -Nru a/fs/jffs2/super.c b/fs/jffs2/super.c
--- a/fs/jffs2/super.c Fri Sep 5 13:16:12 2003
+++ b/fs/jffs2/super.c Fri Sep 5 13:16:12 2003
@@ -174,7 +174,7 @@
int err;
struct nameidata nd;
int mtdnr;
- kdev_t dev;
+ dev_t dev;
if (!dev_name)
return ERR_PTR(-EINVAL);
@@ -240,14 +240,14 @@
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 -Nru a/fs/jfs/inode.c b/fs/jfs/inode.c
--- a/fs/jfs/inode.c Fri Sep 5 13:16:12 2003
+++ b/fs/jfs/inode.c Fri Sep 5 13:16:12 2003
@@ -61,8 +61,7 @@
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 -Nru a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
--- a/fs/jfs/jfs_imap.c Fri Sep 5 13:16:12 2003
+++ b/fs/jfs/jfs_imap.c Fri Sep 5 13:16:12 2003
@@ -3043,7 +3043,7 @@
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 @@
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 -Nru a/fs/minix/inode.c b/fs/minix/inode.c
--- a/fs/minix/inode.c Fri Sep 5 13:16:12 2003
+++ b/fs/minix/inode.c Fri Sep 5 13:16:12 2003
@@ -460,7 +460,7 @@
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 @@
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 -Nru a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
--- a/fs/nfsd/nfsproc.c Fri Sep 5 13:16:12 2003
+++ b/fs/nfsd/nfsproc.c Fri Sep 5 13:16:12 2003
@@ -242,7 +242,7 @@
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 @@
/* 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 -Nru a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
--- a/fs/reiserfs/inode.c Fri Sep 5 13:16:12 2003
+++ b/fs/reiserfs/inode.c Fri Sep 5 13:16:12 2003
@@ -1024,7 +1024,7 @@
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 @@
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 -Nru a/fs/stat.c b/fs/stat.c
--- a/fs/stat.c Fri Sep 5 13:16:12 2003
+++ b/fs/stat.c Fri Sep 5 13:16:12 2003
@@ -24,7 +24,7 @@
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 -Nru a/fs/sysv/inode.c b/fs/sysv/inode.c
--- a/fs/sysv/inode.c Fri Sep 5 13:16:12 2003
+++ b/fs/sysv/inode.c Fri Sep 5 13:16:12 2003
@@ -241,7 +241,7 @@
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 -Nru a/fs/udf/inode.c b/fs/udf/inode.c
--- a/fs/udf/inode.c Fri Sep 5 13:16:13 2003
+++ b/fs/udf/inode.c Fri Sep 5 13:16:13 2003
@@ -1392,8 +1392,8 @@
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 -Nru a/fs/ufs/inode.c b/fs/ufs/inode.c
--- a/fs/ufs/inode.c Fri Sep 5 13:16:12 2003
+++ b/fs/ufs/inode.c Fri Sep 5 13:16:12 2003
@@ -619,7 +619,7 @@
}
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 -Nru a/fs/xfs/linux/xfs_iops.c b/fs/xfs/linux/xfs_iops.c
--- a/fs/xfs/linux/xfs_iops.c Fri Sep 5 13:16:12 2003
+++ b/fs/xfs/linux/xfs_iops.c Fri Sep 5 13:16:12 2003
@@ -178,7 +178,7 @@
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 -Nru a/fs/xfs/linux/xfs_super.c b/fs/xfs/linux/xfs_super.c
--- a/fs/xfs/linux/xfs_super.c Fri Sep 5 13:16:13 2003
+++ b/fs/xfs/linux/xfs_super.c Fri Sep 5 13:16:13 2003
@@ -154,7 +154,7 @@
} 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 @@
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 -Nru a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h
--- a/fs/xfs/xfs_types.h Fri Sep 5 13:16:12 2003
+++ b/fs/xfs/xfs_types.h Fri Sep 5 13:16:12 2003
@@ -210,6 +210,6 @@
#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 -Nru a/fs/xfs/xfsidbg.c b/fs/xfs/xfsidbg.c
--- a/fs/xfs/xfsidbg.c Fri Sep 5 13:16:13 2003
+++ b/fs/xfs/xfsidbg.c Fri Sep 5 13:16:13 2003
@@ -1687,7 +1687,7 @@
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 -Nru a/include/linux/fs.h b/include/linux/fs.h
--- a/include/linux/fs.h Fri Sep 5 13:16:12 2003
+++ b/include/linux/fs.h Fri Sep 5 13:16:12 2003
@@ -373,7 +373,7 @@
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 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 {
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
(Log in to post comments)
|
|||||||||||||