[PATCH] prepare for 32-bit dev_t: mknod()/ustat()

	Changed sys_mknod() prototype to have unsigned int passed to it
instead of current dev_t.  Added old_decode_dev() in sys_mknod() and
made sure that its callers are passing it old_encode_dev(<value>)
	Switched sys_ustat() and its variants from dev_t to unsigned (and
added old_decode_dev()).
	Took care of assignments to ROOT_DEV - again, old_decode_dev().
	Late-boot search in devfs (call sys_newstat() and compare with
st_rdev) also updated.

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index ac3d2d109de5deaee30dea8d345fd4d09587c21f..3079f5efa3b8a1e01de387ff0a28df6b9acb590f 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -498,7 +498,7 @@ static int __init parse_tag_core(const struct tag *tag)
        if (tag->hdr.size > 2) {
                if ((tag->u.core.flags & 1) == 0)
                        root_mountflags &= ~MS_RDONLY;
-               ROOT_DEV = tag->u.core.rootdev;
+               ROOT_DEV = old_decode_dev(tag->u.core.rootdev);
        }
        return 0;
 }

diff --git a/arch/arm26/kernel/setup.c b/arch/arm26/kernel/setup.c
index bd326269e9263612b0a6c779148ffa92926f2efb..afb7db526bd33a2b35139dd86908e63b8497d631 100644 (file)
--- a/arch/arm26/kernel/setup.c
+++ b/arch/arm26/kernel/setup.c
@@ -286,7 +286,7 @@ static int __init parse_tag_core(const struct tag *tag)
        if (tag->hdr.size > 2) {
                if ((tag->u.core.flags & 1) == 0)
                        root_mountflags &= ~MS_RDONLY;
-               ROOT_DEV = tag->u.core.rootdev;
+               ROOT_DEV = old_decode_dev(tag->u.core.rootdev);
        }
        return 0;
 }

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 1387d097f01129b9979860bdd18b4c93f39dd237..01e6f1eeb3306a37b1d3dab9147fb5abc53d6b57 100644 (file)
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -957,7 +957,7 @@ void __init setup_arch(char **cmdline_p)
        pre_setup_arch_hook();
        early_cpu_init();
 
-       ROOT_DEV = ORIG_ROOT_DEV;
+       ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
        drive_info = DRIVE_INFO;
        screen_info = SCREEN_INFO;
        edid_info = EDID_INFO;

diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
index cadafba927ac5d0c59083b8617577c31611409ac..0b9426f0aa9aa929c43b747d842f3e6f8f6a2aea 100644 (file)
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -1188,7 +1188,7 @@ asmlinkage int irix_uname(struct iuname *buf)
 #undef DEBUG_XSTAT
 
 static inline u32
-linux_to_irix_dev_t (dev_t t)
+linux_to_irix_dev_t(dev_t t)
 {
        return MAJOR (t) << 18 | MINOR (t);
 }
@@ -1360,17 +1360,17 @@ asmlinkage int irix_fxstat(int version, int fd, struct stat *statbuf)
        return error;
 }
 
-extern asmlinkage int sys_mknod(const char * filename, int mode, dev_t dev);
+extern asmlinkage int sys_mknod(const char * filename, int mode, unsigned dev);
 
-asmlinkage int irix_xmknod(int ver, char *filename, int mode, dev_t dev)
+asmlinkage int irix_xmknod(int ver, char *filename, int mode, unsigned dev)
 {
        int retval;
-
        printk("[%s:%d] Wheee.. irix_xmknod(%d,%s,%x,%x)\n",
-              current->comm, current->pid, ver, filename, mode, (int) dev);
+              current->comm, current->pid, ver, filename, mode, dev);
 
        switch(ver) {
        case 2:
+               /* shouldn't we convert here as well as on stat()? */
                retval = sys_mknod(filename, mode, dev);
                break;
 

diff --git a/arch/parisc/hpux/sys_hpux.c b/arch/parisc/hpux/sys_hpux.c
index 827bc82c8e54a54276ca238b0665f94f4004981e..a9819d91fcd4eed42fb934d1a81b01eec23c0aa7 100644 (file)
--- a/arch/parisc/hpux/sys_hpux.c
+++ b/arch/parisc/hpux/sys_hpux.c
@@ -272,7 +272,7 @@ int hpux_utssys(char *ubuf, int n, int type)
                break ;
        case 2:
                /*  ustat():  */
-               return( hpux_ustat((dev_t)n, (struct hpux_ustat *)ubuf) );
+               return( hpux_ustat(old_decode_dev(n), (struct hpux_ustat *)ubuf) );
                break ;
        case 3:
                /*  setuname():

diff --git a/arch/ppc/platforms/pmac_setup.c b/arch/ppc/platforms/pmac_setup.c
index 94969b9003f208cc5d5aa29b487b65d4bdf40e6c..fe858f9c6839d6fe0f90d8dac656c9513b24fc9a 100644 (file)
--- a/arch/ppc/platforms/pmac_setup.c
+++ b/arch/ppc/platforms/pmac_setup.c
@@ -107,7 +107,7 @@ extern char saved_command_line[];
 
 extern int pmac_newworld;
 
-#define DEFAULT_ROOT_DEVICE 0x0801     /* sda1 - slightly silly choice */
+#define DEFAULT_ROOT_DEVICE Root_SDA1  /* sda1 - slightly silly choice */
 
 extern void zs_kgdb_hook(int tty_num);
 static void ohare_init(void);

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 0b63803a2c7b3843dc2c7aaf71f8291be5314d3b..1a2b5b9b7203c3ce3792cf4f676eb38f4235e5c2 100644 (file)
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -353,7 +353,7 @@ void __init setup_arch(char **cmdline_p)
        sh_console_init();
 #endif
        
-       ROOT_DEV = ORIG_ROOT_DEV;
+       ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
 
 #ifdef CONFIG_BLK_DEV_RAM
        rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;

diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c
index abb3a9aeafefee183545f19a18e56ca85761d5c6..2092af99068747b06cd892af204050579087c4d9 100644 (file)
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@ -321,7 +321,7 @@ void __init setup_arch(char **cmdline_p)
 
        if (!root_flags)
                root_mountflags &= ~MS_RDONLY;
-       ROOT_DEV = root_dev;
+       ROOT_DEV = old_decode_dev(root_dev);
 #ifdef CONFIG_BLK_DEV_INITRD
        rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
        rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index c875fbf09eac76097a4b2d4f2f36135278464b8a..3b5598ac51be7d1ff1b4da418b4555709eac9709 100644 (file)
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -517,7 +517,7 @@ void __init setup_arch(char **cmdline_p)
 
        if (!root_flags)
                root_mountflags &= ~MS_RDONLY;
-       ROOT_DEV = root_dev;
+       ROOT_DEV = old_decode_dev(root_dev);
 #ifdef CONFIG_BLK_DEV_INITRD
        rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
        rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);

diff --git a/arch/sparc64/solaris/fs.c b/arch/sparc64/solaris/fs.c
index ec819303bc8165ba897a40fe207600f6df88c46d..f0693bfb472e5cbc785d16b9e63abd5b2a00c08f 100644 (file)
--- a/arch/sparc64/solaris/fs.c
+++ b/arch/sparc64/solaris/fs.c
@@ -257,13 +257,13 @@ asmlinkage int solaris_fstat64(unsigned int fd, u32 statbuf)
 
 asmlinkage int solaris_mknod(u32 path, u32 mode, s32 dev)
 {
-       int (*sys_mknod)(const char *,int,dev_t) = 
-               (int (*)(const char *,int,dev_t))SYS(mknod);
+       int (*sys_mknod)(const char *,int,unsigned) = 
+               (int (*)(const char *,int,unsigned))SYS(mknod);
        int major, minor;
 
        if ((major = R4_MAJOR(dev)) > 255 || 
            (minor = R4_MINOR(dev)) > 255) return -EINVAL;
-       return sys_mknod((const char *)A(path), mode, MKDEV(major,minor));
+       return sys_mknod((const char *)A(path), mode, old_encode_dev(MKDEV(major,minor)));
 }
 
 asmlinkage int solaris_xmknod(int vers, u32 path, u32 mode, s32 dev)

diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 9d010db08a28aea9a016f566a53087f493308792..f28b2ebcf90ab0ae813fa113e173953bb8ad330b 100644 (file)
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -1476,7 +1476,7 @@ long sys32_uname(struct old_utsname * name)
 
 extern int sys_ustat(dev_t, struct ustat *);
 
-long sys32_ustat(dev_t dev, struct ustat32 *u32p)
+long sys32_ustat(unsigned dev, struct ustat32 *u32p)
 {
        struct ustat u;
        mm_segment_t seg;

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 14a1b9796ef30100681e28615be2567a6f21cecf..2f9d157a4ac9aefb8d9b58edfe26c16a53c8eb8f 100644 (file)
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -317,7 +317,7 @@ void __init setup_arch(char **cmdline_p)
 {
        unsigned long low_mem_size;
 
-       ROOT_DEV = ORIG_ROOT_DEV;
+       ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
        drive_info = DRIVE_INFO;
        screen_info = SCREEN_INFO;
        edid_info = EDID_INFO;

diff --git a/fs/namei.c b/fs/namei.c
index 9e1fcb922f74a535007b112c13d730ce5e794996..77f59338322bbadb3d2e16cb70d5553c2b31bc64 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1445,7 +1445,7 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
        return error;
 }
 
-asmlinkage long sys_mknod(const char __user * filename, int mode, dev_t dev)
+asmlinkage long sys_mknod(const char __user * filename, int mode, unsigned dev)
 {
        int error = 0;
        char * tmp;
@@ -1471,8 +1471,12 @@ asmlinkage long sys_mknod(const char __user * filename, int mode, dev_t dev)
                case 0: case S_IFREG:
                        error = vfs_create(nd.dentry->d_inode,dentry,mode,&nd);
                        break;
-               case S_IFCHR: case S_IFBLK: case S_IFIFO: case S_IFSOCK:
-                       error = vfs_mknod(nd.dentry->d_inode,dentry,mode,dev);
+               case S_IFCHR: case S_IFBLK:
+                       error = vfs_mknod(nd.dentry->d_inode,dentry,mode,
+                                       old_decode_dev(dev));
+                       break;
+               case S_IFIFO: case S_IFSOCK:
+                       error = vfs_mknod(nd.dentry->d_inode,dentry,mode,0);
                        break;
                case S_IFDIR:
                        error = -EPERM;

diff --git a/fs/super.c b/fs/super.c
index ae60330a6c8f3a93f6021a7944897e5f613075c3..17b41d019d4e870bcafb5d6064f1af7f7f91a996 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -405,14 +405,14 @@ rescan:
        return NULL;
 }
 
-asmlinkage long sys_ustat(dev_t dev, struct ustat __user * ubuf)
+asmlinkage long sys_ustat(unsigned dev, struct ustat __user * ubuf)
 {
         struct super_block *s;
         struct ustat tmp;
         struct kstatfs sbuf;
        int err = -EINVAL;
 
-        s = user_get_super(dev);
+        s = user_get_super(old_decode_dev(dev));
         if (s == NULL)
                 goto out;
        err = vfs_statfs(s, &sbuf);

diff --git a/init/do_mounts.c b/init/do_mounts.c
index f3812f4fc4f966a11781225ac993990746d5de0a..174a2b59e9f903573bfb0bbeb9a484a117ff90af 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -80,7 +80,7 @@ static dev_t __init try_name(char *name, int part)
                /*
                 * Nope.  Try old-style "0321"
                 */
-               res = (dev_t)simple_strtoul(buf, &s, 16);
+               res = old_decode_dev(simple_strtoul(buf, &s, 16));
                if (*s)
                        goto fail;
        }
@@ -107,7 +107,7 @@ static dev_t __init try_name(char *name, int part)
        if (part < range)
                return res + part;
 fail:
-       return (dev_t) 0;
+       return 0;
 }
 
 /*
@@ -146,7 +146,7 @@ dev_t name_to_dev_t(char *name)
                if (sscanf(name, "%u:%u", &maj, &min) == 2) {
                        res = MKDEV(maj, min);
                } else {
-                       res = (dev_t)simple_strtoul(name, &p, 16);
+                       res = old_decode_dev(simple_strtoul(name, &p, 16));
                        if (*p)
                                goto fail;
                }
@@ -187,7 +187,7 @@ out:
        sys_rmdir("/sys");
        return res;
 fail:
-       res = (dev_t) 0;
+       res = 0;
        goto done;
 }
 

diff --git a/init/do_mounts.h b/init/do_mounts.h
index b10b9654a2cda3a276ef2ac57a2a45360ece8971..896a35e88b0cbd0b3138baa06074e217b1b5554b 100644 (file)
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -10,7 +10,7 @@
 #include <linux/root_dev.h>
 
 asmlinkage long sys_unlink(const char *name);
-asmlinkage long sys_mknod(const char *name, int mode, dev_t dev);
+asmlinkage long sys_mknod(const char *name, int mode, unsigned dev);
 asmlinkage long sys_newstat(char * filename, struct stat * statbuf);
 asmlinkage long sys_ioctl(int fd, int cmd, unsigned long arg);
 asmlinkage long sys_mkdir(const char *name, int mode);
@@ -43,7 +43,7 @@ static inline void umount_devfs(const char *path) {}
 static inline int create_dev(char *name, dev_t dev, char *devfs_name)
 {
        sys_unlink(name);
-       return sys_mknod(name, S_IFBLK|0600, dev);
+       return sys_mknod(name, S_IFBLK|0600, old_encode_dev(dev));
 }
 
 #endif

diff --git a/init/do_mounts_devfs.c b/init/do_mounts_devfs.c
index 652582658d280eb147149a99265311a450eaa6e6..62823da6ab6b3d00241e7db0173933a91be09439 100644 (file)
--- a/init/do_mounts_devfs.c
+++ b/init/do_mounts_devfs.c
@@ -78,7 +78,7 @@ static void * __init read_dir(char *path, int *len)
 /*
  * recursively scan <path>, looking for a device node of type <dev>
  */
-static int __init find_in_devfs(char *path, dev_t dev)
+static int __init find_in_devfs(char *path, unsigned dev)
 {
        struct stat buf;
        char *end = path + strlen(path);
@@ -140,7 +140,7 @@ int __init create_dev(char *name, dev_t dev, char *devfs_name)
        if (!dev)
                return -1;
        strcpy(path, "/dev");
-       if (find_in_devfs(path, dev) < 0)
+       if (find_in_devfs(path, old_encode_dev(dev)) < 0)
                return -1;
        return sys_symlink(path + 5, name);
 }

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 521e7f6aa78390bf33da63ac16f945e6ebc804c8..2dfa179de5f0d720a5377d7ff1938d027a3f83dd 100644 (file)
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -40,7 +40,7 @@ static void __init handle_initrd(void)
        int error;
        int i, pid;
 
-       real_root_dev = ROOT_DEV;
+       real_root_dev = old_encode_dev(ROOT_DEV);
        create_dev("/dev/root.old", Root_RAM0, NULL);
        /* mount initrd on rootfs' /root */
        mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
@@ -69,12 +69,12 @@ static void __init handle_initrd(void)
        close(root_fd);
        umount_devfs("/old/dev");
 
-       if (real_root_dev == Root_RAM0) {
+       if (old_decode_dev(real_root_dev) == Root_RAM0) {
                sys_chdir("/old");
                return;
        }
 
-       ROOT_DEV = real_root_dev;
+       ROOT_DEV = old_decode_dev(real_root_dev);
        mount_root();
 
        printk(KERN_NOTICE "Trying to move old root to /initrd ... ");

diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index a3444e771718fa5c2ca46a339f953cd9a3105ef8..bb6dad2f82f091b96b4c63263e1642547347db70 100644 (file)
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -136,7 +136,7 @@ static void __init md_setup_drive(void)
                        snprintf(comp_name, 63, "/dev/%s", devname);
                        if (sys_newstat(comp_name, &buf) == 0 &&
                                                        S_ISBLK(buf.st_mode))
-                               dev = buf.st_rdev;
+                               dev = old_decode_dev(buf.st_rdev);
                        if (!dev) {
                                printk(KERN_WARNING "md: Unknown device name: %s\n", devname);
                                break;

diff --git a/init/initramfs.c b/init/initramfs.c
index 6aed40d0a3c50368b9e0f521409f45cd20486396..2dc24eaedbc226831ace19f48295688295a880b8 100644 (file)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -24,7 +24,7 @@ static void __init free(void *where)
 }
 
 asmlinkage long sys_mkdir(char *name, int mode);
-asmlinkage long sys_mknod(char *name, int mode, dev_t dev);
+asmlinkage long sys_mknod(char *name, int mode, unsigned dev);
 asmlinkage long sys_symlink(char *old, char *new);
 asmlinkage long sys_link(char *old, char *new);
 asmlinkage long sys_write(int fd, const char *buf, size_t size);
@@ -92,7 +92,7 @@ static __initdata mode_t mode;
 static __initdata unsigned long body_len, name_len;
 static __initdata uid_t uid;
 static __initdata gid_t gid;
-static __initdata dev_t rdev;
+static __initdata unsigned rdev;
 
 static void __init parse_header(char *s)
 {
@@ -113,7 +113,7 @@ static void __init parse_header(char *s)
        body_len = parsed[6];
        major = parsed[7];
        minor = parsed[8];
-       rdev = MKDEV(parsed[9], parsed[10]);
+       rdev = old_encode_dev(MKDEV(parsed[9], parsed[10]));
        name_len = parsed[11];
 }