[PATCH] *_mknod prototype

The dev_t argument of sys_mknod is passed to vfs_mknod, and is then cast
to int when foo_mknod is called, and is subsequently very often cast
back to dev_t.  (For example, minix_mknod() calls minix_set_inode() that
takes a dev_t.)

This is a cleanup that avoids this back-and-forth casting by giving
foo_mknod a prototype with dev_t.  In most cases now the dev_t is
transmitted untouched until init_special_inode.

It also makes the two routines hugetlbfs_get_inode() and
shmem_get_inode() static.

diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 9ed995b75fbff0cf07275b6bab2de5f8c494218d..2351591b275c643f9bb1ec0c71019f40cf2118d8 100644 (file)
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -35,7 +35,7 @@ prototypes:
        int (*symlink) (struct inode *,struct dentry *,const char *);
        int (*mkdir) (struct inode *,struct dentry *,int);
        int (*rmdir) (struct inode *,struct dentry *);
-       int (*mknod) (struct inode *,struct dentry *,int,int);
+       int (*mknod) (struct inode *,struct dentry *,int,dev_t);
        int (*rename) (struct inode *, struct dentry *,
                        struct inode *, struct dentry *);
        int (*readlink) (struct dentry *, char *,int);

diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index d14db016e09d1e2b8c06efec43744a1fea26bbc0..09c219cfb2841670f0ea82084fbc6c5fc183d3c5 100644 (file)
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -258,7 +258,7 @@ struct inode_operations {
        int (*symlink) (struct inode *,struct dentry *,const char *);
        int (*mkdir) (struct inode *,struct dentry *,int);
        int (*rmdir) (struct inode *,struct dentry *);
-       int (*mknod) (struct inode *,struct dentry *,int,int);
+       int (*mknod) (struct inode *,struct dentry *,int,dev_t);
        int (*rename) (struct inode *, struct dentry *,
                        struct inode *, struct dentry *);
        int (*readlink) (struct dentry *, char *,int);

diff --git a/drivers/hotplug/pci_hotplug_core.c b/drivers/hotplug/pci_hotplug_core.c
index 9ada504c26a726a74845d4634833b3c1a607d4cb..b6ab87135c30dd795e7d08dbe20818de90e4ae0e 100644 (file)
--- a/drivers/hotplug/pci_hotplug_core.c
+++ b/drivers/hotplug/pci_hotplug_core.c
@@ -121,7 +121,7 @@ static struct proc_dir_entry *slotdir = NULL;
 static const char *slotdir_name = "slots";
 #endif
 
-static struct inode *pcihpfs_get_inode (struct super_block *sb, int mode, int dev)
+static struct inode *pcihpfs_get_inode (struct super_block *sb, int mode, dev_t dev)
 {
        struct inode *inode = new_inode(sb);
 
@@ -153,7 +153,7 @@ static struct inode *pcihpfs_get_inode (struct super_block *sb, int mode, int de
 }
 
 /* SMP-safe */
-static int pcihpfs_mknod (struct inode *dir, struct dentry *dentry, int mode, int dev)
+static int pcihpfs_mknod (struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
 {
        struct inode *inode = pcihpfs_get_inode(dir->i_sb, mode, dev);
        int error = -ENOSPC;

diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index a7306cf26a358441bef321b3b33accd23975dc1d..ee5900f3969fdce2dc660f94d092044488ff80dc 100644 (file)
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -143,7 +143,7 @@ static int parse_options(struct super_block *s, char *data)
 
 /* --------------------------------------------------------------------- */
 
-static struct inode *usbfs_get_inode (struct super_block *sb, int mode, int dev)
+static struct inode *usbfs_get_inode (struct super_block *sb, int mode, dev_t dev)
 {
        struct inode *inode = new_inode(sb);
 
@@ -176,7 +176,7 @@ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, int dev)
 
 /* SMP-safe */
 static int usbfs_mknod (struct inode *dir, struct dentry *dentry, int mode,
-                       int dev)
+                       dev_t dev)
 {
        struct inode *inode = usbfs_get_inode(dir->i_sb, mode, dev);
        int error = -EPERM;

diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 4f378704b4a8aca562621f334cffed2d49882444..a7952879bd8fa52d13f64a035390a75e43aa6bd1 100644 (file)
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -29,7 +29,7 @@
 
 /* dir inode-ops */
 static int coda_create(struct inode *dir, struct dentry *new, int mode);
-static int coda_mknod(struct inode *dir, struct dentry *new, int mode, int rdev);
+static int coda_mknod(struct inode *dir, struct dentry *new, int mode, dev_t rdev);
 static struct dentry *coda_lookup(struct inode *dir, struct dentry *target);
 static int coda_link(struct dentry *old_dentry, struct inode *dir_inode, 
                     struct dentry *entry);
@@ -230,7 +230,7 @@ static int coda_create(struct inode *dir, struct dentry *de, int mode)
         return 0;
 }
 
-static int coda_mknod(struct inode *dir, struct dentry *de, int mode, int rdev)
+static int coda_mknod(struct inode *dir, struct dentry *de, int mode, dev_t rdev)
 {
         int error=0;
        const char *name=de->d_name.name;
@@ -740,4 +740,3 @@ return_bad:
        unlock_kernel();
        return -EIO;
 }
-

diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 60de2eaee8af76a38c8bc1185f62cfe33ca047a7..221bfb88ed4a7792aa119d192122dac47e80813d 100644 (file)
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -310,8 +310,8 @@ int venus_rename(struct super_block *sb, struct ViceFid *old_fid,
 }
 
 int venus_create(struct super_block *sb, struct ViceFid *dirfid, 
-                   const char *name, int length, int excl, int mode, int rdev,
-                   struct ViceFid *newfid, struct coda_vattr *attrs) 
+                const char *name, int length, int excl, int mode, dev_t rdev,
+                struct ViceFid *newfid, struct coda_vattr *attrs) 
 {
         union inputArgs *inp;
         union outputArgs *outp;

diff --git a/fs/devfs/base.c b/fs/devfs/base.c
index d54683b572eedb05f42603904fe5c48b41b5425b..88c5aa16059938a1eda9763793d2e174019a93a0 100644 (file)
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -3103,7 +3103,7 @@ static int devfs_rmdir (struct inode *dir, struct dentry *dentry)
 }   /*  End Function devfs_rmdir  */
 
 static int devfs_mknod (struct inode *dir, struct dentry *dentry, int mode,
-                       int rdev)
+                       dev_t rdev)
 {
     int err;
     struct fs_info *fs_info = dir->i_sb->s_fs_info;

diff --git a/fs/devices.c b/fs/devices.c
index 1b8f3e2546e3c0ad42ad49c68e419c68aa090980..adf05053eeb7dcadf4c201a523823d98130239b0 100644 (file)
--- a/fs/devices.c
+++ b/fs/devices.c
@@ -202,7 +202,7 @@ static struct file_operations bad_sock_fops = {
        .open           = sock_no_open
 };
 
-void init_special_inode(struct inode *inode, umode_t mode, int rdev)
+void init_special_inode(struct inode *inode, umode_t mode, dev_t rdev)
 {
        inode->i_mode = mode;
        if (S_ISCHR(mode)) {
@@ -217,5 +217,6 @@ void init_special_inode(struct inode *inode, umode_t mode, int rdev)
        else if (S_ISSOCK(mode))
                inode->i_fop = &bad_sock_fops;
        else
-               printk(KERN_DEBUG "init_special_inode: bogus imode (%o)\n", mode);
+               printk(KERN_DEBUG "init_special_inode: bogus imode (%o)\n",
+                      mode);
 }

diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 8e9e4069ad3b5c4fa937c0d89b870bd1ddff5c0c..9f0788e3f6ef7e06e5b0f78544500a7dac2a14fb 100644 (file)
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -134,7 +134,7 @@ static int ext2_create (struct inode * dir, struct dentry * dentry, int mode)
        return err;
 }
 
-static int ext2_mknod (struct inode * dir, struct dentry *dentry, int mode, int rdev)
+static int ext2_mknod (struct inode * dir, struct dentry *dentry, int mode, dev_t rdev)
 {
        struct inode * inode = ext2_new_inode (dir, mode);
        int err = PTR_ERR(inode);

diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 98ac54526a5d0c660786abba0afce795abcdae47..e1abbb5552c043996a7c8ff3ff1c7430b60df7c7 100644 (file)
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -1616,7 +1616,7 @@ static int ext3_create (struct inode * dir, struct dentry * dentry, int mode)
 }
 
 static int ext3_mknod (struct inode * dir, struct dentry *dentry,
-                       int mode, int rdev)
+                       int mode, dev_t rdev)
 {
        handle_t *handle;
        struct inode *inode;

diff --git a/fs/hpfs/hpfs_fn.h b/fs/hpfs/hpfs_fn.h
index 824d5785c7d8dadb8d8b4c01370e29886cc1046a..34a2c5039cc37da034767bf3ba3edf7fe6ab0450 100644 (file)
--- a/fs/hpfs/hpfs_fn.h
+++ b/fs/hpfs/hpfs_fn.h
@@ -282,7 +282,7 @@ void hpfs_decide_conv(struct inode *, unsigned char *, unsigned);
 
 int hpfs_mkdir(struct inode *, struct dentry *, int);
 int hpfs_create(struct inode *, struct dentry *, int);
-int hpfs_mknod(struct inode *, struct dentry *, int, int);
+int hpfs_mknod(struct inode *, struct dentry *, int, dev_t);
 int hpfs_symlink(struct inode *, struct dentry *, const char *);
 int hpfs_unlink(struct inode *, struct dentry *);
 int hpfs_rmdir(struct inode *, struct dentry *);

diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index cc2857b95c46537c4612256aed933297edf725f6..1736980fd0209323971c506fcc8b91b00385cad4 100644 (file)
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -181,7 +181,7 @@ bail:
        return -ENOSPC;
 }
 
-int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev)
+int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
 {
        const char *name = dentry->d_name.name;
        unsigned len = dentry->d_name.len;

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 16da9d0c9e75d2162adb70d105c6eddff85fc531..2c9b1d26b8fde8b44d18dca160a7444e59bf0525 100644 (file)
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -359,7 +359,8 @@ out:
        return error;
 }
 
-struct inode *hugetlbfs_get_inode(struct super_block *sb, int mode, int dev)
+static struct inode *
+hugetlbfs_get_inode(struct super_block *sb, int mode, dev_t dev)
 {
        struct inode * inode = new_inode(sb);
 
@@ -399,7 +400,8 @@ struct inode *hugetlbfs_get_inode(struct super_block *sb, int mode, int dev)
  * File creation. Allocate an inode, and we're done..
  */
 /* SMP-safe */
-static int hugetlbfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev)
+static int
+hugetlbfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
 {
        struct inode * inode = hugetlbfs_get_inode(dir->i_sb, mode, dev);
        int error = -ENOSPC;

diff --git a/fs/intermezzo/dir.c b/fs/intermezzo/dir.c
index b1205bf9c7bfbd3964b7b41b52a55d4aba253322..573c318e31380ccfdf88916d42e08fbfb8d84368 100644 (file)
--- a/fs/intermezzo/dir.c
+++ b/fs/intermezzo/dir.c
@@ -720,7 +720,7 @@ static int presto_rmdir(struct inode *dir, struct dentry *dentry)
         return error;
 }
 
-static int presto_mknod(struct inode * dir, struct dentry * dentry, int mode, int rdev)
+static int presto_mknod(struct inode * dir, struct dentry * dentry, int mode, dev_t rdev)
 {
         int error;
         struct presto_cache *cache;

diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index 1349e6027ca0b76f6fc2d6b9593eaad3a4922cc8..1b0b9fa5070f3ad319af596a776f6d95f707ae73 100644 (file)
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -1072,7 +1072,7 @@ jffs_remove_end:
 
 
 static int
-jffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev)
+jffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
 {
        struct jffs_raw_inode raw_inode;
        struct jffs_file *dir_f;

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index 68c34e81137b62350268993b062b896eb38b8516..9c60f565699a1240db107fd17bebdc3e272c61ff 100644 (file)
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -32,7 +32,7 @@ static int jffs2_unlink (struct inode *,struct dentry *);
 static int jffs2_symlink (struct inode *,struct dentry *,const char *);
 static int jffs2_mkdir (struct inode *,struct dentry *,int);
 static int jffs2_rmdir (struct inode *,struct dentry *);
-static int jffs2_mknod (struct inode *,struct dentry *,int,int);
+static int jffs2_mknod (struct inode *,struct dentry *,int,dev_t);
 static int jffs2_rename (struct inode *, struct dentry *,
                         struct inode *, struct dentry *);
 
@@ -573,7 +573,7 @@ static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry)
        return ret;
 }
 
-static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, int rdev)
+static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, dev_t rdev)
 {
        struct jffs2_inode_info *f, *dir_f;
        struct jffs2_sb_info *c;

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 9426deae5094804bedaf3fad1a1b2f9c7329bdb0..603c8f7d13229402531704f139e521fd69ab3ee3 100644 (file)
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -1316,7 +1316,7 @@ int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
  *
  * FUNCTION:    Create a special file (device)
  */
-int jfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev)
+int jfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
 {
        struct btstack btstack;
        struct component_name dname;

diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 01b2e3a2831a213e7a72f4218d08b9bd86764cf8..d2b9ae264ce1dde454165771ad26c8fc8637ed13 100644 (file)
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -75,7 +75,7 @@ static struct dentry *minix_lookup(struct inode * dir, struct dentry *dentry)
        return NULL;
 }
 
-static int minix_mknod(struct inode * dir, struct dentry *dentry, int mode, int rdev)
+static int minix_mknod(struct inode * dir, struct dentry *dentry, int mode, dev_t rdev)
 {
        int error;
        struct inode * inode = minix_new_inode(dir, &error);

diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index 959d512a82ccd39752947961116c99f9292e740a..58d2fbd70556158eb785ce6b84aaa90785b7cdb1 100644 (file)
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -42,7 +42,7 @@ static int ncp_rmdir(struct inode *, struct dentry *);
 static int ncp_rename(struct inode *, struct dentry *,
                      struct inode *, struct dentry *);
 static int ncp_mknod(struct inode * dir, struct dentry *dentry,
-                    int mode, int rdev);
+                    int mode, dev_t rdev);
 #if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS)
 extern int ncp_symlink(struct inode *, struct dentry *, const char *);
 #else
@@ -883,7 +883,7 @@ out_close:
 }
 
 int ncp_create_new(struct inode *dir, struct dentry *dentry, int mode,
-                  int rdev, int attributes)
+                  dev_t rdev, int attributes)
 {
        struct ncp_server *server = NCP_SERVER(dir);
        struct ncp_entry_info finfo;
@@ -1169,7 +1169,7 @@ out:
 }
 
 static int ncp_mknod(struct inode * dir, struct dentry *dentry,
-                    int mode, int rdev)
+                    int mode, dev_t rdev)
 {
        if (ncp_is_nfs_extras(NCP_SERVER(dir), NCP_FINFO(dir)->volNumber)) {
                DPRINTK(KERN_DEBUG "ncp_mknod: mode = 0%o\n", mode);

diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h
index b25803e232723feffd0b31fc72e9553b37c0bfd6..29c2ec683c77fded4efb6691d3d1552b9bb1a90e 100644 (file)
--- a/fs/ncpfs/ncplib_kernel.h
+++ b/fs/ncpfs/ncplib_kernel.h
@@ -117,7 +117,7 @@ int ncp_dirhandle_alloc(struct ncp_server *, __u8 vol, __u32 dirent, __u8 *dirha
 int ncp_dirhandle_free(struct ncp_server *, __u8 dirhandle);
 
 int ncp_create_new(struct inode *dir, struct dentry *dentry,
-                          int mode, int rdev, int attributes);
+                          int mode, dev_t rdev, int attributes);
 
 static inline int ncp_is_nfs_extras(struct ncp_server* server, unsigned int volnum) {
 #ifdef CONFIG_NCPFS_NFS_NS

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 8f7f90ba5f1035605e040bdc690433b0e46a0add..b7f9bf5eb32a28faaa701d152d11dfa2ad58fddd 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -45,7 +45,7 @@ static int nfs_rmdir(struct inode *, struct dentry *);
 static int nfs_unlink(struct inode *, struct dentry *);
 static int nfs_symlink(struct inode *, struct dentry *, const char *);
 static int nfs_link(struct dentry *, struct inode *, struct dentry *);
-static int nfs_mknod(struct inode *, struct dentry *, int, int);
+static int nfs_mknod(struct inode *, struct dentry *, int, dev_t);
 static int nfs_rename(struct inode *, struct dentry *,
                      struct inode *, struct dentry *);
 
@@ -801,7 +801,8 @@ static int nfs_create(struct inode *dir, struct dentry *dentry, int mode)
 /*
  * See comments for nfs_proc_create regarding failed operations.
  */
-static int nfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev)
+static int
+nfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
 {
        struct iattr attr;
        struct nfs_fattr fattr;

diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index dea3cdd2bd1fb2f4f09cc015f864c6b412c6b9be..64b5c100cb9191e4dcb41cd9e996aaf2a09ba5c8 100644 (file)
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -47,7 +47,7 @@ static struct backing_dev_info ramfs_backing_dev_info = {
        .memory_backed  = 1,    /* Does not contribute to dirty memory */
 };
 
-struct inode *ramfs_get_inode(struct super_block *sb, int mode, int dev)
+static struct inode *ramfs_get_inode(struct super_block *sb, int mode, dev_t dev)
 {
        struct inode * inode = new_inode(sb);
 
@@ -87,14 +87,15 @@ struct inode *ramfs_get_inode(struct super_block *sb, int mode, int dev)
  * File creation. Allocate an inode, and we're done..
  */
 /* SMP-safe */
-static int ramfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev)
+static int
+ramfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
 {
        struct inode * inode = ramfs_get_inode(dir->i_sb, mode, dev);
        int error = -ENOSPC;
 
        if (inode) {
                d_instantiate(dentry, inode);
-               dget(dentry);           /* Extra count - pin the dentry in core */
+               dget(dentry);   /* Extra count - pin the dentry in core */
                error = 0;
        }
        return error;

diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 7a5e99ce610afc5f9cf241cfcffeee2493d39472..c82566d48d2f444bfd1d98c4426ee271a4137d65 100644 (file)
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -605,7 +605,7 @@ out_failed:
 }
 
 
-static int reiserfs_mknod (struct inode * dir, struct dentry *dentry, int mode, int rdev)
+static int reiserfs_mknod (struct inode * dir, struct dentry *dentry, int mode, dev_t rdev)
 {
     int retval;
     struct inode * inode;

diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c
index c4793aa522de6313a22bb496813543c67ca3760e..b943f0052798ebaa8e37cd307f8b58fe764e6757 100644 (file)
--- a/fs/smbfs/dir.c
+++ b/fs/smbfs/dir.c
@@ -31,7 +31,7 @@ static int smb_rmdir(struct inode *, struct dentry *);
 static int smb_unlink(struct inode *, struct dentry *);
 static int smb_rename(struct inode *, struct dentry *,
                      struct inode *, struct dentry *);
-static int smb_make_node(struct inode *,struct dentry *,int,int);
+static int smb_make_node(struct inode *,struct dentry *,int,dev_t);
 static int smb_link(struct dentry *, struct inode *, struct dentry *);
 
 struct file_operations smb_dir_operations =
@@ -641,7 +641,7 @@ out:
  * matches the connection credentials (and we don't know which those are ...)
  */
 static int
-smb_make_node(struct inode *dir, struct dentry *dentry, int mode, int dev)
+smb_make_node(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
 {
        int error;
        struct iattr attr;

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 758b72b5060229549c6378d23d2547c4fcc14ab5..886038498183f22baa6b7a8c4317ea20026743a4 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -87,7 +87,7 @@ static struct inode *sysfs_get_inode(struct super_block *sb, int mode, int dev)
        return inode;
 }
 
-static int sysfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev)
+static int sysfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
 {
        struct inode *inode;
        int error = 0;

diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c
index 5a6c2246d2516b2268b4f78c4a1e04f5ef1b4e75..f2988f107696a6b1a396f9c3d7887729a1a115ff 100644 (file)
--- a/fs/sysv/namei.c
+++ b/fs/sysv/namei.c
@@ -83,7 +83,7 @@ static struct dentry *sysv_lookup(struct inode * dir, struct dentry * dentry)
        return NULL;
 }
 
-static int sysv_mknod(struct inode * dir, struct dentry * dentry, int mode, int rdev)
+static int sysv_mknod(struct inode * dir, struct dentry * dentry, int mode, dev_t rdev)
 {
        struct inode * inode = sysv_new_inode(dir, mode);
        int err = PTR_ERR(inode);

diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index 138b1c8e3debf549bdf8a741365117268798a313..b5be4880deaca9da3277faec59ab0e322997619c 100644 (file)
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -669,7 +669,7 @@ static int udf_create(struct inode *dir, struct dentry *dentry, int mode)
        return 0;
 }
 
-static int udf_mknod(struct inode * dir, struct dentry * dentry, int mode, int rdev)
+static int udf_mknod(struct inode * dir, struct dentry * dentry, int mode, dev_t rdev)
 {
        struct inode * inode;
        struct udf_fileident_bh fibh;

diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index b98fb35af72d7cf16ad31ec6eeac27c709f78697..24c6c5d2938d87dc45f8623ab9ee9ba7af73a0ea 100644 (file)
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -108,7 +108,7 @@ static int ufs_create (struct inode * dir, struct dentry * dentry, int mode)
        return err;
 }
 
-static int ufs_mknod (struct inode * dir, struct dentry *dentry, int mode, int rdev)
+static int ufs_mknod (struct inode * dir, struct dentry *dentry, int mode, dev_t rdev)
 {
        struct inode * inode = ufs_new_inode(dir, mode);
        int err = PTR_ERR(inode);

diff --git a/fs/umsdos/namei.c b/fs/umsdos/namei.c
index 1ee0e1a352782835954c540bbd17793960ed9dd2..3d89ba970a065c0d8fb298a1c70194ad4573c83f 100644 (file)
--- a/fs/umsdos/namei.c
+++ b/fs/umsdos/namei.c
@@ -237,7 +237,7 @@ static int umsdos_nevercreat (struct inode *dir, struct dentry *dentry,
  * The same is true for directory creation.
  */
 static int umsdos_create_any (struct inode *dir, struct dentry *dentry,
-                               int mode, int rdev, char flags)
+                               int mode, dev_t rdev, char flags)
 {
        struct dentry *fake;
        struct inode *inode;
@@ -861,7 +861,7 @@ out_remove:
  * in particular and other parts of the kernel I guess.
  */
 int UMSDOS_mknod (struct inode *dir, struct dentry *dentry,
-                int mode, int rdev)
+                int mode, dev_t rdev)
 {
        return umsdos_create_any (dir, dentry, mode, rdev, 0);
 }

diff --git a/fs/xfs/linux/xfs_iops.c b/fs/xfs/linux/xfs_iops.c
index b9bb91a68660503ed4517ec969ac07fa162442d0..97f58864933dbf45dcfef1555578f9b985379a03 100644 (file)
--- a/fs/xfs/linux/xfs_iops.c
+++ b/fs/xfs/linux/xfs_iops.c
@@ -69,7 +69,7 @@ linvfs_mknod(
        struct inode    *dir,
        struct dentry   *dentry,
        int             mode,
-       int             rdev)
+       dev_t           rdev)
 {
        struct inode    *ip;
        vattr_t         va;

diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index defce1be68cebd3a397253b6642b11fa0ec25e6c..0e3f73f7a73ea40ba81b3ae38c5c68c008d168aa 100644 (file)
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -47,13 +47,13 @@ int venus_close(struct super_block *sb, struct ViceFid *fid, int flags,
 int venus_open(struct super_block *sb, struct ViceFid *fid,
                int flags, struct file **f);
 int venus_mkdir(struct super_block *sb, struct ViceFid *dirfid, 
-                         const char *name, int length, 
-                         struct ViceFid *newfid, struct coda_vattr *attrs);
+               const char *name, int length, 
+               struct ViceFid *newfid, struct coda_vattr *attrs);
 int venus_create(struct super_block *sb, struct ViceFid *dirfid, 
-                   const char *name, int length, int excl, int mode, int rdev,
-                   struct ViceFid *newfid, struct coda_vattr *attrs) ;
+                const char *name, int length, int excl, int mode, dev_t rdev,
+                struct ViceFid *newfid, struct coda_vattr *attrs) ;
 int venus_rmdir(struct super_block *sb, struct ViceFid *dirfid, 
-                   const char *name, int length);
+               const char *name, int length);
 int venus_remove(struct super_block *sb, struct ViceFid *dirfid, 
                 const char *name, int length);
 int venus_readlink(struct super_block *sb, struct ViceFid *fid, 

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7aa6498d7d5dc711ff51e32031b3ccab30e65e04..bbb4e2cacecca1fa2faaeccc5a12d6f450c5e72a 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -773,7 +773,7 @@ struct inode_operations {
        int (*symlink) (struct inode *,struct dentry *,const char *);
        int (*mkdir) (struct inode *,struct dentry *,int);
        int (*rmdir) (struct inode *,struct dentry *);
-       int (*mknod) (struct inode *,struct dentry *,int,int);
+       int (*mknod) (struct inode *,struct dentry *,int,dev_t);
        int (*rename) (struct inode *, struct dentry *,
                        struct inode *, struct dentry *);
        int (*readlink) (struct dentry *, char *,int);
@@ -1109,7 +1109,7 @@ extern inline const char *bdevname(struct block_device *bdev)
 }
 extern const char * cdevname(kdev_t);
 extern const char * kdevname(kdev_t);
-extern void init_special_inode(struct inode *, umode_t, int);
+extern void init_special_inode(struct inode *, umode_t, dev_t);
 
 /* Invalid inode operations -- fs/bad_inode.c */
 extern void make_bad_inode(struct inode *);

diff --git a/include/linux/umsdos_fs.p b/include/linux/umsdos_fs.p
index 99e6eefa822996cec53b33ad0a5725687d538aeb..7034b7eb6b1651910332325d58a47e711792e2d3 100644 (file)
--- a/include/linux/umsdos_fs.p
+++ b/include/linux/umsdos_fs.p
@@ -82,7 +82,7 @@ int UMSDOS_mkdir (struct inode *dir,
 int UMSDOS_mknod (struct inode *dir,
                  struct dentry *dentry,
                  int mode,
-                 int rdev);
+                 dev_t rdev);
 int UMSDOS_rmdir (struct inode *dir,struct dentry *dentry);
 int UMSDOS_unlink (struct inode *dir, struct dentry *dentry);
 int UMSDOS_rename (struct inode *old_dir,

diff --git a/include/linux/umsdos_fs_i.h b/include/linux/umsdos_fs_i.h
index 0edfb1d541a47225de43423eb4cbe6414d6f843f..f4c992b44cd2c13fc70527e9207fd0b37b3d6b46 100644 (file)
--- a/include/linux/umsdos_fs_i.h
+++ b/include/linux/umsdos_fs_i.h
@@ -50,9 +50,9 @@ struct dir_locking_info {
 struct umsdos_inode_info {
        struct msdos_inode_info msdos_info;
        struct dir_locking_info dir_info;
-       int i_patched;                  /* Inode has been patched */
-       int i_is_hlink;                 /* Resolved hardlink inode? */
-       off_t pos;                      /* Entry offset in the emd_owner file */
+       int i_patched;          /* Inode has been patched */
+       int i_is_hlink;         /* Resolved hardlink inode? */
+       off_t pos;              /* Entry offset in the emd_owner file */
 };
 
 #endif

diff --git a/mm/shmem.c b/mm/shmem.c
index d8dc724620d4acfb916239890612244a8639a7c3..2325743e2561b99bf18e570dc41f5710f89b00da 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1015,7 +1015,8 @@ static int shmem_mmap(struct file *file, struct vm_area_struct *vma)
        return 0;
 }
 
-struct inode *shmem_get_inode(struct super_block *sb, int mode, int dev)
+static struct inode *
+shmem_get_inode(struct super_block *sb, int mode, dev_t dev)
 {
        struct inode *inode;
        struct shmem_inode_info *info;
@@ -1426,7 +1427,8 @@ static int shmem_statfs(struct super_block *sb, struct statfs *buf)
 /*
  * File creation. Allocate an inode, and we're done..
  */
-static int shmem_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev)
+static int
+shmem_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
 {
        struct inode *inode = shmem_get_inode(dir->i_sb, mode, dev);
        int error = -ENOSPC;