Messages in this thread Patches in this message | | | Date | Tue, 1 Jan 2002 22:23:17 -0500 (EST) | From | Frank Davis <> | Subject | [PATCH] 2.5.2-pre6: MKDEV replacements fs dir |
| |
Hello all, I've attached the neccessary MKDEV replacements for the fs dir.
Regards, Frank --- fs/nfs/nfsroot.c.old Fri Jul 20 00:47:16 2001 +++ fs/nfs/nfsroot.c Tue Jan 1 22:08:06 2002 @@ -334,7 +334,7 @@ */ int __init nfs_root_setup(char *line) { - ROOT_DEV = MKDEV(UNNAMED_MAJOR, 255); + ROOT_DEV = mk_kdev(UNNAMED_MAJOR, 255); if (line[0] == '/' || line[0] == ',' || (line[0] >= '0' && line[0] <= '9')) { strncpy(nfs_root_name, line, sizeof(nfs_root_name)); nfs_root_name[sizeof(nfs_root_name)-1] = '\0';--- fs/romfs/inode.c.old Tue Jan 1 18:16:50 2002 +++ fs/romfs/inode.c Tue Jan 1 22:10:09 2002 @@ -518,7 +518,7 @@ default: /* depending on MBZ for sock/fifos */ nextfh = ntohl(ri.spec); - nextfh = kdev_t_to_nr(MKDEV(nextfh>>16,nextfh&0xffff)); + nextfh = kdev_t_to_nr(mk_kdev(nextfh>>16,nextfh&0xffff)); init_special_inode(i, ino, nextfh); } }--- fs/partitions/msdos.c.old Sat Nov 10 23:34:01 2001 +++ fs/partitions/msdos.c Tue Jan 1 22:11:18 2002 @@ -166,7 +166,7 @@ add_gd_partition(hd, *current_minor, next, size); #if CONFIG_BLK_DEV_MD if (SYS_IND(p) == LINUX_RAID_PARTITION) { - md_autodetect_dev(MKDEV(hd->major,*current_minor)); + md_autodetect_dev(mk_kdev(hd->major,*current_minor)); } #endif @@ -580,7 +580,7 @@ NR_SECTS(p)*sector_size); #if CONFIG_BLK_DEV_MD if (SYS_IND(p) == LINUX_RAID_PARTITION) { - md_autodetect_dev(MKDEV(hd->major,minor)); + md_autodetect_dev(mk_kdev(hd->major,minor)); } #endif if (is_extended_partition(p)) {--- fs/devfs/util.c.old Tue Jan 1 18:16:37 2002 +++ fs/devfs/util.c Tue Jan 1 22:13:10 2002 @@ -267,7 +267,7 @@ if (minor >= 256) continue; __set_bit (minor, entry->bits); up (semaphore); - return MKDEV (entry->major, minor); + return mk_kdev (entry->major, minor); } /* Need to allocate a new major */ if ( ( entry = kmalloc (sizeof *entry, GFP_KERNEL) ) == NULL ) @@ -289,7 +289,7 @@ else list->last->next = entry; list->last = entry; up (semaphore); - return MKDEV (entry->major, 0); + return mk_kdev (entry->major, 0); } /* End Function devfs_alloc_devnum */ EXPORT_SYMBOL(devfs_alloc_devnum); --- fs/devfs/base.c.old Tue Jan 1 18:16:37 2002 +++ fs/devfs/base.c Tue Jan 1 22:12:42 2002 @@ -894,7 +894,7 @@ { devfs_dealloc_devnum ( S_ISCHR (de->mode) ? DEVFS_SPECIAL_CHR : DEVFS_SPECIAL_BLK, - MKDEV (de->u.fcb.u.device.major, + mk_kdev (de->u.fcb.u.device.major, de->u.fcb.u.device.minor) ); } WRITE_ENTRY_MAGIC (de, 0); @@ -2413,7 +2413,7 @@ { int tmp; int retval = 0; - kdev_t dev = MKDEV (de->u.fcb.u.device.major, de->u.fcb.u.device.minor); + kdev_t dev = mk_kdev (de->u.fcb.u.device.major, de->u.fcb.u.device.minor); struct block_device_operations *bdops; extern int warn_no_part; @@ -2599,14 +2599,14 @@ inode->i_rdev = NODEV; if ( S_ISCHR (de->mode) ) { - inode->i_rdev = MKDEV (de->u.fcb.u.device.major, + inode->i_rdev = mk_kdev (de->u.fcb.u.device.major, de->u.fcb.u.device.minor); inode->i_cdev = cdget ( kdev_t_to_nr (inode->i_rdev) ); is_fcb = TRUE; } else if ( S_ISBLK (de->mode) ) { - inode->i_rdev = MKDEV (de->u.fcb.u.device.major, + inode->i_rdev = mk_kdev (de->u.fcb.u.device.major, de->u.fcb.u.device.minor); if (bd_acquire (inode) == 0) {--- fs/intermezzo/kml_reint.c.old Fri Nov 23 03:47:33 2001 +++ fs/intermezzo/kml_reint.c Tue Jan 1 22:16:48 2002 @@ -281,7 +281,7 @@ old_fs = get_fs(); set_fs (get_ds()); error = lento_mknod (mknod->path, mknod->mode, - MKDEV(mknod->major, mknod->minor), &info); + mk_kdev(mknod->major, mknod->minor), &info); set_fs (old_fs); kmlreint_post_secure (rec); EXIT;--- fs/intermezzo/psdev.c.old Tue Jan 1 18:16:39 2002 +++ fs/intermezzo/psdev.c Tue Jan 1 22:17:59 2002 @@ -78,12 +78,12 @@ { int minor; - if ( MAJOR(file->f_dentry->d_inode->i_rdev) != PRESTO_PSDEV_MAJOR ) { + if ( major(file->f_dentry->d_inode->i_rdev) != PRESTO_PSDEV_MAJOR ) { EXIT; return NULL; } - minor = MINOR(file->f_dentry->d_inode->i_rdev); + minor = minor(file->f_dentry->d_inode->i_rdev); if ( minor < 0 || minor >= MAX_PRESTODEV ) { EXIT; return NULL; @@ -290,7 +290,7 @@ } len = readmount.io_len; - minor = MINOR(dev); + minor = minor(dev); PRESTO_ALLOC(tmp, char *, len); if (!tmp) { EXIT; @@ -627,7 +627,7 @@ EXIT; return error; } - minor = MINOR(dev); + minor = minor(dev); if (cmd == PRESTO_SETOPT) error = dosetopt(minor, &kopt); @@ -788,7 +788,7 @@ } error = lento_mknod(input.name, input.mode, - MKDEV(input.major,input.minor),&input.info); + mk_kdev(input.major,input.minor),&input.info); EXIT; return error; }--- fs/jffs2/readinode.c.old Sun Sep 30 20:39:54 2001 +++ fs/jffs2/readinode.c Tue Jan 1 22:15:20 2002 @@ -437,7 +437,7 @@ case S_IFSOCK: case S_IFIFO: inode->i_op = &jffs2_file_inode_operations; - init_special_inode(inode, inode->i_mode, kdev_t_to_nr(MKDEV(rdev>>8, rdev&0xff))); + init_special_inode(inode, inode->i_mode, kdev_t_to_nr(mk_kdev(rdev>>8, rdev&0xff))); break; default: | |