Skip to content

Commit

Permalink
switch ->mknod() to umode_t
Browse files Browse the repository at this point in the history 
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Jan 4, 2012
1 parent 4acdaf2 commit 1a67aaf
Show file tree
Hide file tree
Showing 42 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Documentation/filesystems/Locking
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ata *);
int (*symlink) (struct inode *,struct dentry *,const char *);
int (*mkdir) (struct inode *,struct dentry *,umode_t);
int (*rmdir) (struct inode *,struct dentry *);
int (*mknod) (struct inode *,struct dentry *,int,dev_t);
int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t);
int (*rename) (struct inode *, struct dentry *,
struct inode *, struct dentry *);
int (*readlink) (struct dentry *, char __user *,int);
Expand Down
2 changes: 1 addition & 1 deletion Documentation/filesystems/vfs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ struct inode_operations {
int (*symlink) (struct inode *,struct dentry *,const char *);
int (*mkdir) (struct inode *,struct dentry *,umode_t);
int (*rmdir) (struct inode *,struct dentry *);
int (*mknod) (struct inode *,struct dentry *,int,dev_t);
int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t);
int (*rename) (struct inode *, struct dentry *,
struct inode *, struct dentry *);
int (*readlink) (struct dentry *, char __user *,int);
Expand Down
2 changes: 1 addition & 1 deletion fs/9p/vfs_inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1397,7 +1397,7 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,
*/

static int
v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
{
int retval;
char *name;
Expand Down
6 changes: 3 additions & 3 deletions fs/9p/vfs_inode_dotl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include "acl.h"

static int
v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, int omode,
v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
dev_t rdev);

/**
Expand Down Expand Up @@ -799,7 +799,7 @@ v9fs_vfs_link_dotl(struct dentry *old_dentry, struct inode *dir,
*
*/
static int
v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, int omode,
v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
dev_t rdev)
{
int err;
Expand All @@ -814,7 +814,7 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, int omode,
struct posix_acl *dacl = NULL, *pacl = NULL;

P9_DPRINTK(P9_DEBUG_VFS,
" %lu,%s mode: %x MAJOR: %u MINOR: %u\n", dir->i_ino,
" %lu,%s mode: %hx MAJOR: %u MINOR: %u\n", dir->i_ino,
dentry->d_name.name, omode, MAJOR(rdev), MINOR(rdev));

if (!new_valid_dev(rdev))
Expand Down
2 changes: 1 addition & 1 deletion fs/bad_inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static int bad_inode_rmdir (struct inode *dir, struct dentry *dentry)
}

static int bad_inode_mknod (struct inode *dir, struct dentry *dentry,
int mode, dev_t rdev)
umode_t mode, dev_t rdev)
{
return -EIO;
}
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4596,7 +4596,7 @@ static int btrfs_add_nondir(struct btrfs_trans_handle *trans,
}

static int btrfs_mknod(struct inode *dir, struct dentry *dentry,
int mode, dev_t rdev)
umode_t mode, dev_t rdev)
{
struct btrfs_trans_handle *trans;
struct btrfs_root *root = BTRFS_I(dir)->root;
Expand Down
4 changes: 2 additions & 2 deletions fs/ceph/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ int ceph_handle_notrace_create(struct inode *dir, struct dentry *dentry)
}

static int ceph_mknod(struct inode *dir, struct dentry *dentry,
int mode, dev_t rdev)
umode_t mode, dev_t rdev)
{
struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
struct ceph_mds_client *mdsc = fsc->mdsc;
Expand All @@ -676,7 +676,7 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,
if (ceph_snap(dir) != CEPH_NOSNAP)
return -EROFS;

dout("mknod in dir %p dentry %p mode 0%o rdev %d\n",
dout("mknod in dir %p dentry %p mode 0%ho rdev %d\n",
dir, dentry, mode, rdev);
req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_MKNOD, USE_AUTH_MDS);
if (IS_ERR(req)) {
Expand Down
2 changes: 1 addition & 1 deletion fs/cifs/cifsfs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ extern struct dentry *cifs_lookup(struct inode *, struct dentry *,
struct nameidata *);
extern int cifs_unlink(struct inode *dir, struct dentry *dentry);
extern int cifs_hardlink(struct dentry *, struct inode *, struct dentry *);
extern int cifs_mknod(struct inode *, struct dentry *, int, dev_t);
extern int cifs_mknod(struct inode *, struct dentry *, umode_t, dev_t);
extern int cifs_mkdir(struct inode *, struct dentry *, umode_t);
extern int cifs_rmdir(struct inode *, struct dentry *);
extern int cifs_rename(struct inode *, struct dentry *, struct inode *,
Expand Down
2 changes: 1 addition & 1 deletion fs/cifs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, umode_t mode,
return rc;
}

int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode,
int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode,
dev_t device_number)
{
int rc = -EPERM;
Expand Down
2 changes: 1 addition & 1 deletion fs/ecryptfs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)
}

static int
ecryptfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
ecryptfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
{
int rc;
struct dentry *lower_dentry;
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static int exofs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
return err;
}

static int exofs_mknod(struct inode *dir, struct dentry *dentry, int mode,
static int exofs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
dev_t rdev)
{
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/ext2/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ static int ext2_create (struct inode * dir, struct dentry * dentry, umode_t mode
return ext2_add_nondir(dentry, inode);
}

static int ext2_mknod (struct inode * dir, struct dentry *dentry, int mode, dev_t rdev)
static int ext2_mknod (struct inode * dir, struct dentry *dentry, umode_t mode, dev_t rdev)
{
struct inode * inode;
int err;
Expand Down
2 changes: 1 addition & 1 deletion fs/ext3/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1732,7 +1732,7 @@ static int ext3_create (struct inode * dir, struct dentry * dentry, umode_t mode
}

static int ext3_mknod (struct inode * dir, struct dentry *dentry,
int mode, dev_t rdev)
umode_t mode, dev_t rdev)
{
handle_t *handle;
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/ext4/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,7 @@ static int ext4_create(struct inode *dir, struct dentry *dentry, umode_t mode,
}

static int ext4_mknod(struct inode *dir, struct dentry *dentry,
int mode, dev_t rdev)
umode_t mode, dev_t rdev)
{
handle_t *handle;
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/fuse/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_req *req,
return err;
}

static int fuse_mknod(struct inode *dir, struct dentry *entry, int mode,
static int fuse_mknod(struct inode *dir, struct dentry *entry, umode_t mode,
dev_t rdev)
{
struct fuse_mknod_in inarg;
Expand Down
2 changes: 1 addition & 1 deletion fs/gfs2/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
*
*/

static int gfs2_mknod(struct inode *dir, struct dentry *dentry, int mode,
static int gfs2_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
dev_t dev)
{
return gfs2_create_inode(dir, dentry, mode, dev, NULL, 0, 0);
Expand Down
2 changes: 1 addition & 1 deletion fs/hfsplus/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ static int hfsplus_symlink(struct inode *dir, struct dentry *dentry,
}

static int hfsplus_mknod(struct inode *dir, struct dentry *dentry,
int mode, dev_t rdev)
umode_t mode, dev_t rdev)
{
struct hfsplus_sb_info *sbi = HFSPLUS_SB(dir->i_sb);
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/hostfs/hostfs_kern.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ int hostfs_rmdir(struct inode *ino, struct dentry *dentry)
return err;
}

int hostfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
static int hostfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
{
struct inode *inode;
char *name;
Expand Down
2 changes: 1 addition & 1 deletion fs/hpfs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, s
return err;
}

static int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
static int hpfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
{
const unsigned char *name = dentry->d_name.name;
unsigned len = dentry->d_name.len;
Expand Down
2 changes: 1 addition & 1 deletion fs/hugetlbfs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, uid_t uid,
* File creation. Allocate an inode, and we're done..
*/
static int hugetlbfs_mknod(struct inode *dir,
struct dentry *dentry, int mode, dev_t dev)
struct dentry *dentry, umode_t mode, dev_t dev)
{
struct inode *inode;
int error = -ENOSPC;
Expand Down
4 changes: 2 additions & 2 deletions fs/jffs2/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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 *,umode_t);
static int jffs2_rmdir (struct inode *,struct dentry *);
static int jffs2_mknod (struct inode *,struct dentry *,int,dev_t);
static int jffs2_mknod (struct inode *,struct dentry *,umode_t,dev_t);
static int jffs2_rename (struct inode *, struct dentry *,
struct inode *, struct dentry *);

Expand Down Expand Up @@ -618,7 +618,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, dev_t rdev)
static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, umode_t mode, dev_t rdev)
{
struct jffs2_inode_info *f, *dir_f;
struct jffs2_sb_info *c;
Expand Down
2 changes: 1 addition & 1 deletion fs/jfs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1353,7 +1353,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
* FUNCTION: Create a special file (device)
*/
static int jfs_mknod(struct inode *dir, struct dentry *dentry,
int mode, dev_t rdev)
umode_t mode, dev_t rdev)
{
struct jfs_inode_info *jfs_ip;
struct btstack btstack;
Expand Down
2 changes: 1 addition & 1 deletion fs/logfs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ static int logfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
return __logfs_create(dir, dentry, inode, NULL, 0);
}

static int logfs_mknod(struct inode *dir, struct dentry *dentry, int mode,
static int logfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
dev_t rdev)
{
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/minix/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static struct dentry *minix_lookup(struct inode * dir, struct dentry *dentry, st
return NULL;
}

static int minix_mknod(struct inode * dir, struct dentry *dentry, int mode, dev_t rdev)
static int minix_mknod(struct inode * dir, struct dentry *dentry, umode_t mode, dev_t rdev)
{
int error;
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2444,7 +2444,7 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
}
EXPORT_SYMBOL(user_path_create);

int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
{
int error = may_create(dir, dentry);

Expand Down
6 changes: 3 additions & 3 deletions fs/ncpfs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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, dev_t rdev);
umode_t 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
Expand Down Expand Up @@ -1201,12 +1201,12 @@ static int ncp_rename(struct inode *old_dir, struct dentry *old_dentry,
}

static int ncp_mknod(struct inode * dir, struct dentry *dentry,
int mode, dev_t rdev)
umode_t mode, dev_t rdev)
{
if (!new_valid_dev(rdev))
return -EINVAL;
if (ncp_is_nfs_extras(NCP_SERVER(dir), NCP_FINFO(dir)->volNumber)) {
DPRINTK(KERN_DEBUG "ncp_mknod: mode = 0%o\n", mode);
DPRINTK(KERN_DEBUG "ncp_mknod: mode = 0%ho\n", mode);
return ncp_create_new(dir, dentry, mode, rdev, 0);
}
return -EPERM; /* Strange, but true */
Expand Down
4 changes: 2 additions & 2 deletions fs/nfs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,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, dev_t);
static int nfs_mknod(struct inode *, struct dentry *, umode_t, dev_t);
static int nfs_rename(struct inode *, struct dentry *,
struct inode *, struct dentry *);
static int nfs_fsync_dir(struct file *, loff_t, loff_t, int);
Expand Down Expand Up @@ -1693,7 +1693,7 @@ static int nfs_create(struct inode *dir, struct dentry *dentry,
* See comments for nfs_proc_create regarding failed operations.
*/
static int
nfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
nfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
{
struct iattr attr;
int status;
Expand Down
2 changes: 1 addition & 1 deletion fs/nilfs2/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static int nilfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
}

static int
nilfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
nilfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
{
struct inode *inode;
struct nilfs_transaction_info ti;
Expand Down
2 changes: 1 addition & 1 deletion fs/ocfs2/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, int mode)

static int ocfs2_mknod(struct inode *dir,
struct dentry *dentry,
int mode,
umode_t mode,
dev_t dev)
{
int status = 0;
Expand Down
2 changes: 1 addition & 1 deletion fs/ramfs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct inode *ramfs_get_inode(struct super_block *sb,
*/
/* SMP-safe */
static int
ramfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
ramfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
{
struct inode * inode = ramfs_get_inode(dir->i_sb, dir, mode, dev);
int error = -ENOSPC;
Expand Down
2 changes: 1 addition & 1 deletion fs/reiserfs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mod
return retval;
}

static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, int mode,
static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
dev_t rdev)
{
int retval;
Expand Down
2 changes: 1 addition & 1 deletion fs/sysv/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static struct dentry *sysv_lookup(struct inode * dir, struct dentry * dentry, st
return NULL;
}

static int sysv_mknod(struct inode * dir, struct dentry * dentry, int mode, dev_t rdev)
static int sysv_mknod(struct inode * dir, struct dentry * dentry, umode_t mode, dev_t rdev)
{
struct inode * inode;
int err;
Expand Down
2 changes: 1 addition & 1 deletion fs/ubifs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
}

static int ubifs_mknod(struct inode *dir, struct dentry *dentry,
int mode, dev_t rdev)
umode_t mode, dev_t rdev)
{
struct inode *inode;
struct ubifs_inode *ui;
Expand Down
2 changes: 1 addition & 1 deletion fs/udf/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ static int udf_create(struct inode *dir, struct dentry *dentry, umode_t mode,
return 0;
}

static int udf_mknod(struct inode *dir, struct dentry *dentry, int mode,
static int udf_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
dev_t rdev)
{
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/ufs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static int ufs_create (struct inode * dir, struct dentry * dentry, umode_t mode,
return err;
}

static int ufs_mknod (struct inode * dir, struct dentry *dentry, int mode, dev_t rdev)
static int ufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
{
struct inode *inode;
int err;
Expand Down
2 changes: 1 addition & 1 deletion fs/xfs/xfs_iops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ STATIC int
xfs_vn_mknod(
struct inode *dir,
struct dentry *dentry,
int mode,
umode_t mode,
dev_t rdev)
{
struct inode *inode;
Expand Down
Loading

0 comments on commit 1a67aaf

Please sign in to comment.