From c9add9b811a80322afe4388aa012ff431d41e0cf Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Thu, 4 Jul 2002 08:54:03 -0700 Subject: [PATCH] [PATCH] assorted kdev_t cleanups in filesystems * JFS uses its ->logdev only twice - one of the places assigns it to_kdev_t(le32_to_cpu(...)), another uses kdev_t_to_nr() of it. Switched to u32 - it's just a place where we store device number we'd got from superblock. * several reiserfs_fs.h function prototypes removed - functions in question don't exist anymore. * smbfs doesn't support device nodes; ->f_rdev removed. --- fs/jfs/jfs_incore.h | 2 +- fs/jfs/jfs_logmgr.c | 2 +- fs/jfs/jfs_mount.c | 2 +- fs/smbfs/inode.c | 2 -- include/linux/reiserfs_fs.h | 3 --- include/linux/reiserfs_fs_sb.h | 2 +- include/linux/smb.h | 2 -- 7 files changed, 4 insertions(+), 11 deletions(-) diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h index c54907dddbe5..71256e2322cd 100644 --- a/fs/jfs/jfs_incore.h +++ b/fs/jfs/jfs_incore.h @@ -122,7 +122,7 @@ struct jfs_sb_info { short nbperpage; /* 2: blocks per page */ short l2nbperpage; /* 2: log2 blocks per page */ short l2niperblk; /* 2: log2 inodes per page */ - kdev_t logdev; /* 2: external log device */ + u32 logdev; /* 2: external log device */ uint aggregate; /* volume identifier in log record */ pxd_t logpxd; /* 8: pxd describing log */ pxd_t ait2; /* 8: pxd describing AIT copy */ diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 1bd50e77c4a5..68e08f8b6004 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c @@ -1102,7 +1102,7 @@ int lmLogOpen(struct super_block *sb, log_t ** logptr) */ externalLog: - if (!(bdev = bdget(kdev_t_to_nr(JFS_SBI(sb)->logdev)))) { + if (!(bdev = bdget(JFS_SBI(sb)->logdev))) { rc = ENODEV; goto free; } diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c index afab3ab7ed5f..d8a7773fa9ff 100644 --- a/fs/jfs/jfs_mount.c +++ b/fs/jfs/jfs_mount.c @@ -406,7 +406,7 @@ static int chkSuper(struct super_block *sb) if (sbi->mntflag & JFS_INLINELOG) sbi->logpxd = j_sb->s_logpxd; else { - sbi->logdev = to_kdev_t(le32_to_cpu(j_sb->s_logdev)); + sbi->logdev = le32_to_cpu(j_sb->s_logdev); memcpy(sbi->uuid, j_sb->s_uuid, sizeof(sbi->uuid)); memcpy(sbi->loguuid, j_sb->s_loguuid, sizeof(sbi->uuid)); } diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index c0b5997f0b7d..0d439b0b1508 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c @@ -145,7 +145,6 @@ smb_get_inode_attr(struct inode *inode, struct smb_fattr *fattr) fattr->f_ino = inode->i_ino; fattr->f_uid = inode->i_uid; fattr->f_gid = inode->i_gid; - fattr->f_rdev = inode->i_rdev; fattr->f_size = inode->i_size; fattr->f_mtime = inode->i_mtime; fattr->f_ctime = inode->i_ctime; @@ -183,7 +182,6 @@ smb_set_inode_attr(struct inode *inode, struct smb_fattr *fattr) inode->i_nlink = fattr->f_nlink; inode->i_uid = fattr->f_uid; inode->i_gid = fattr->f_gid; - inode->i_rdev = fattr->f_rdev; inode->i_ctime = fattr->f_ctime; inode->i_blksize= fattr->f_blksize; inode->i_blocks = fattr->f_blocks; diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index 29f6063b3546..d8b3fa0a7ba0 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h @@ -1675,13 +1675,10 @@ int pop_journal_writer(int windex) ; int journal_transaction_should_end(struct reiserfs_transaction_handle *, int) ; int reiserfs_in_journal(struct super_block *p_s_sb, unsigned long bl, int searchall, unsigned long *next) ; int journal_begin(struct reiserfs_transaction_handle *, struct super_block *p_s_sb, unsigned long) ; -struct super_block *reiserfs_get_super(kdev_t dev) ; void flush_async_commits(struct super_block *p_s_sb) ; int buffer_journaled(const struct buffer_head *bh) ; int mark_buffer_journal_new(struct buffer_head *bh) ; -int reiserfs_sync_all_buffers(kdev_t dev, int wait) ; -int reiserfs_sync_buffers(kdev_t dev, int wait) ; int reiserfs_add_page_to_flush_list(struct reiserfs_transaction_handle *, struct inode *, struct buffer_head *) ; int reiserfs_remove_page_from_flush_list(struct reiserfs_transaction_handle *, diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h index 04ec2e907f90..534d8e20bdb7 100644 --- a/include/linux/reiserfs_fs_sb.h +++ b/include/linux/reiserfs_fs_sb.h @@ -160,7 +160,7 @@ struct reiserfs_transaction_handle { int t_blocks_allocated ; /* number of blocks this writer allocated */ unsigned long t_trans_id ; /* sanity check, equals the current trans id */ struct super_block *t_super ; /* super for this FS when journal_begin was - called. saves calls to reiserfs_get_super */ + called. */ } ; /* diff --git a/include/linux/smb.h b/include/linux/smb.h index a9d88d856df5..5b8dce292377 100644 --- a/include/linux/smb.h +++ b/include/linux/smb.h @@ -10,7 +10,6 @@ #define _LINUX_SMB_H #include -#include enum smb_protocol { SMB_PROTOCOL_NONE, @@ -85,7 +84,6 @@ struct smb_fattr { nlink_t f_nlink; uid_t f_uid; gid_t f_gid; - kdev_t f_rdev; loff_t f_size; time_t f_atime; time_t f_mtime; -- 2.39.5