summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAlexander Viro <viro@math.psu.edu>2002-06-11 00:56:00 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-06-11 00:56:00 -0700
commitb7031fe52611f9e0347c47f18cb50af520df0d78 (patch)
treea38b3bbacd723f69147371a4947b2cfc25329f09 /include/linux
parentaaa44e6b5b5a0f8280483b72e9c9e8aa4629a7a1 (diff)
[PATCH] (10/14) resync
->s_dev is switched to dev_t. Everything that uses it uses it as a number - i.e. all instances are either minor() or kdev_t_to_nr().
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fs.h2
-rw-r--r--include/linux/kdev_t.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 450e909d7375..3b13c9baffd4 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -627,7 +627,7 @@ extern spinlock_t sb_lock;
#define S_BIAS (1<<30)
struct super_block {
struct list_head s_list; /* Keep this first */
- kdev_t s_dev;
+ dev_t s_dev; /* search index; _not_ kdev_t */
unsigned long s_blocksize;
unsigned long s_old_blocksize;
unsigned char s_blocksize_bits;
diff --git a/include/linux/kdev_t.h b/include/linux/kdev_t.h
index f9e74fd52f96..2c61fc5161b6 100644
--- a/include/linux/kdev_t.h
+++ b/include/linux/kdev_t.h
@@ -36,8 +36,8 @@ typedef struct { unsigned short major, minor; } kdev_t;
Admissible operations on an object of type kdev_t:
- passing it along
- comparing it for equality with another such object
-- storing it in ROOT_DEV, inode->i_dev, inode->i_rdev, sb->s_dev,
- bh->b_dev, req->rq_dev, de->dc_dev, tty->device
+- storing it in inode->i_dev, inode->i_rdev, req->rq_dev, de->dc_dev,
+- tty->device
- using its bit pattern as argument in a hash function
- finding its major and minor
- complaining about it