diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 23:59:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 23:59:51 -0800 |
| commit | 39769961b842895bddecbae7d823e894a6a11d17 (patch) | |
| tree | 8e8d3227c01fa99ca8e5ba680ee266d6f88b7f3b /fs/devfs | |
| parent | a914dd8b3b9ee9ccb2659b55fc98933c9f2a9c73 (diff) | |
v2.5.1.6 -> v2.5.1.7
- Jeff Garzik: fix up loop and md for struct kdev_t typechecking
- Jeff Garzik: improved old-tulip network driver
- Arnaldo: more scsi driver bio updates
- Kai Germaschewski: ISDN updates
- various: kdev_t updates
Diffstat (limited to 'fs/devfs')
| -rw-r--r-- | fs/devfs/base.c | 12 | ||||
| -rw-r--r-- | fs/devfs/util.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/fs/devfs/base.c b/fs/devfs/base.c index db6ec7adfd1a..9aa28ef93510 100644 --- a/fs/devfs/base.c +++ b/fs/devfs/base.c @@ -1063,16 +1063,16 @@ static struct devfs_entry *_devfs_get_root_entry (void) if ( ( new = _devfs_alloc_entry (".devfsd", 0, S_IFCHR |S_IRUSR |S_IWUSR) ) == NULL ) return NULL; devnum = devfs_alloc_devnum (DEVFS_SPECIAL_CHR); - new->u.fcb.u.device.major = MAJOR (devnum); - new->u.fcb.u.device.minor = MINOR (devnum); + new->u.fcb.u.device.major = major (devnum); + new->u.fcb.u.device.minor = minor (devnum); new->u.fcb.ops = &devfsd_fops; _devfs_append_entry (root_entry, new, FALSE, NULL); #ifdef CONFIG_DEVFS_DEBUG if ( ( new = _devfs_alloc_entry (".stat", 0, S_IFCHR | S_IRUGO | S_IWUGO) ) == NULL ) return NULL; devnum = devfs_alloc_devnum (DEVFS_SPECIAL_CHR); - new->u.fcb.u.device.major = MAJOR (devnum); - new->u.fcb.u.device.minor = MINOR (devnum); + new->u.fcb.u.device.major = major (devnum); + new->u.fcb.u.device.minor = minor (devnum); new->u.fcb.ops = &stat_fops; _devfs_append_entry (root_entry, new, FALSE, NULL); #endif @@ -1558,8 +1558,8 @@ devfs_handle_t devfs_register (devfs_handle_t dir, const char *name, name, S_ISCHR (mode) ? "char" : "block"); return NULL; } - major = MAJOR (devnum); - minor = MINOR (devnum); + major = major (devnum); + minor = minor (devnum); } if ( ( de = _devfs_prepare_leaf (&dir, name, mode) ) == NULL ) { diff --git a/fs/devfs/util.c b/fs/devfs/util.c index 39a7d09a254d..e09c869dfb2c 100644 --- a/fs/devfs/util.c +++ b/fs/devfs/util.c @@ -320,8 +320,8 @@ void devfs_dealloc_devnum (char type, kdev_t devnum) semaphore = &block_semaphore; list = &block_list; } - major = MAJOR (devnum); - minor = MINOR (devnum); + major = major (devnum); + minor = minor (devnum); down (semaphore); for (entry = list->first; entry != NULL; entry = entry->next) { |