Skip to content

Commit

Permalink
switch vfs_mkdir() and ->mkdir() to umode_t
Browse files Browse the repository at this point in the history 
vfs_mkdir() gets int, but immediately drops everything that might not
fit into umode_t and that's the only caller of ->mkdir()...

Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Jan 4, 2012
1 parent 8208a22 commit 18bb1db
Show file tree
Hide file tree
Showing 56 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion Documentation/filesystems/Locking
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ata *);
int (*link) (struct dentry *,struct inode *,struct dentry *);
int (*unlink) (struct inode *,struct dentry *);
int (*symlink) (struct inode *,struct dentry *,const char *);
int (*mkdir) (struct inode *,struct dentry *,int);
int (*mkdir) (struct inode *,struct dentry *,umode_t);
int (*rmdir) (struct inode *,struct dentry *);
int (*mknod) (struct inode *,struct dentry *,int,dev_t);
int (*rename) (struct inode *, struct dentry *,
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 @@ -346,7 +346,7 @@ struct inode_operations {
int (*link) (struct dentry *,struct inode *,struct dentry *);
int (*unlink) (struct inode *,struct dentry *);
int (*symlink) (struct inode *,struct dentry *,const char *);
int (*mkdir) (struct inode *,struct dentry *,int);
int (*mkdir) (struct inode *,struct dentry *,umode_t);
int (*rmdir) (struct inode *,struct dentry *);
int (*mknod) (struct inode *,struct dentry *,int,dev_t);
int (*rename) (struct inode *, struct dentry *,
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/pohmelfs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ static int pohmelfs_create(struct inode *dir, struct dentry *dentry, int mode,
return pohmelfs_create_entry(dir, dentry, 0, mode);
}

static int pohmelfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int pohmelfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
int err;

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 @@ -785,7 +785,7 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode,
*
*/

static int v9fs_vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int v9fs_vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
int err;
u32 perm;
Expand Down
2 changes: 1 addition & 1 deletion fs/9p/vfs_inode_dotl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode,
*/

static int v9fs_vfs_mkdir_dotl(struct inode *dir,
struct dentry *dentry, int omode)
struct dentry *dentry, umode_t omode)
{
int err;
struct v9fs_session_info *v9ses;
Expand Down
2 changes: 1 addition & 1 deletion fs/affs/affs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ extern int affs_hash_name(struct super_block *sb, const u8 *name, unsigned int l
extern struct dentry *affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *);
extern int affs_unlink(struct inode *dir, struct dentry *dentry);
extern int affs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *);
extern int affs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
extern int affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
extern int affs_rmdir(struct inode *dir, struct dentry *dentry);
extern int affs_link(struct dentry *olddentry, struct inode *dir,
struct dentry *dentry);
Expand Down
4 changes: 2 additions & 2 deletions fs/affs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,12 @@ affs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata
}

int
affs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
struct inode *inode;
int error;

pr_debug("AFFS: mkdir(%lu,\"%.*s\",0%o)\n",dir->i_ino,
pr_debug("AFFS: mkdir(%lu,\"%.*s\",0%ho)\n",dir->i_ino,
(int)dentry->d_name.len,dentry->d_name.name,mode);

inode = affs_new_inode(dir);
Expand Down
6 changes: 3 additions & 3 deletions fs/afs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static int afs_lookup_filldir(void *_cookie, const char *name, int nlen,
loff_t fpos, u64 ino, unsigned dtype);
static int afs_create(struct inode *dir, struct dentry *dentry, int mode,
struct nameidata *nd);
static int afs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
static int afs_rmdir(struct inode *dir, struct dentry *dentry);
static int afs_unlink(struct inode *dir, struct dentry *dentry);
static int afs_link(struct dentry *from, struct inode *dir,
Expand Down Expand Up @@ -764,7 +764,7 @@ static void afs_d_release(struct dentry *dentry)
/*
* create a directory on an AFS filesystem
*/
static int afs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
struct afs_file_status status;
struct afs_callback cb;
Expand All @@ -777,7 +777,7 @@ static int afs_mkdir(struct inode *dir, struct dentry *dentry, int mode)

dvnode = AFS_FS_I(dir);

_enter("{%x:%u},{%s},%o",
_enter("{%x:%u},{%s},%ho",
dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name, mode);

ret = -ENAMETOOLONG;
Expand Down
4 changes: 2 additions & 2 deletions fs/autofs4/root.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
static int autofs4_dir_symlink(struct inode *,struct dentry *,const char *);
static int autofs4_dir_unlink(struct inode *,struct dentry *);
static int autofs4_dir_rmdir(struct inode *,struct dentry *);
static int autofs4_dir_mkdir(struct inode *,struct dentry *,int);
static int autofs4_dir_mkdir(struct inode *,struct dentry *,umode_t);
static long autofs4_root_ioctl(struct file *,unsigned int,unsigned long);
#ifdef CONFIG_COMPAT
static long autofs4_root_compat_ioctl(struct file *,unsigned int,unsigned long);
Expand Down Expand Up @@ -699,7 +699,7 @@ static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry)
return 0;
}

static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
struct autofs_info *ino = autofs4_dentry_ino(dentry);
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 @@ -202,7 +202,7 @@ static int bad_inode_symlink (struct inode *dir, struct dentry *dentry,
}

static int bad_inode_mkdir(struct inode *dir, struct dentry *dentry,
int mode)
umode_t mode)
{
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 @@ -4792,7 +4792,7 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,
return err;
}

static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
struct inode *inode = NULL;
struct btrfs_trans_handle *trans;
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 @@ -753,7 +753,7 @@ static int ceph_symlink(struct inode *dir, struct dentry *dentry,
return err;
}

static int ceph_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int ceph_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
struct ceph_mds_client *mdsc = fsc->mdsc;
Expand All @@ -767,7 +767,7 @@ static int ceph_mkdir(struct inode *dir, struct dentry *dentry, int mode)
dout("mksnap dir %p snap '%.*s' dn %p\n", dir,
dentry->d_name.len, dentry->d_name.name, dentry);
} else if (ceph_snap(dir) == CEPH_NOSNAP) {
dout("mkdir dir %p dn %p mode 0%o\n", dir, dentry, mode);
dout("mkdir dir %p dn %p mode 0%ho\n", dir, dentry, mode);
op = CEPH_MDS_OP_MKDIR;
} else {
goto out;
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 @@ -51,7 +51,7 @@ extern struct dentry *cifs_lookup(struct inode *, struct dentry *,
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_mkdir(struct inode *, struct dentry *, int);
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 *,
struct dentry *);
Expand Down
4 changes: 2 additions & 2 deletions fs/cifs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry)
return rc;
}

int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode)
{
int rc = 0, tmprc;
int xid;
Expand All @@ -1275,7 +1275,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
struct inode *newinode = NULL;
struct cifs_fattr fattr;

cFYI(1, "In cifs_mkdir, mode = 0x%x inode = 0x%p", mode, inode);
cFYI(1, "In cifs_mkdir, mode = 0x%hx inode = 0x%p", mode, inode);

cifs_sb = CIFS_SB(inode->i_sb);
tlink = cifs_sb_tlink(cifs_sb);
Expand Down
4 changes: 2 additions & 2 deletions fs/coda/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static int coda_link(struct dentry *old_dentry, struct inode *dir_inode,
static int coda_unlink(struct inode *dir_inode, struct dentry *entry);
static int coda_symlink(struct inode *dir_inode, struct dentry *entry,
const char *symname);
static int coda_mkdir(struct inode *dir_inode, struct dentry *entry, int mode);
static int coda_mkdir(struct inode *dir_inode, struct dentry *entry, umode_t mode);
static int coda_rmdir(struct inode *dir_inode, struct dentry *entry);
static int coda_rename(struct inode *old_inode, struct dentry *old_dentry,
struct inode *new_inode, struct dentry *new_dentry);
Expand Down Expand Up @@ -223,7 +223,7 @@ static int coda_create(struct inode *dir, struct dentry *de, int mode, struct na
return error;
}

static int coda_mkdir(struct inode *dir, struct dentry *de, int mode)
static int coda_mkdir(struct inode *dir, struct dentry *de, umode_t mode)
{
struct inode *inode;
struct coda_vattr attrs;
Expand Down
2 changes: 1 addition & 1 deletion fs/configfs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@ void configfs_undepend_item(struct configfs_subsystem *subsys,
}
EXPORT_SYMBOL(configfs_undepend_item);

static int configfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int configfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
int ret = 0;
int module_got = 0;
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 @@ -559,7 +559,7 @@ static int ecryptfs_symlink(struct inode *dir, struct dentry *dentry,
return rc;
}

static int ecryptfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int ecryptfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
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 @@ -153,7 +153,7 @@ static int exofs_link(struct dentry *old_dentry, struct inode *dir,
return exofs_add_nondir(dentry, inode);
}

static int exofs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int exofs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
struct inode *inode;
int err = -EMLINK;
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 @@ -214,7 +214,7 @@ static int ext2_link (struct dentry * old_dentry, struct inode * dir,
return err;
}

static int ext2_mkdir(struct inode * dir, struct dentry * dentry, int mode)
static int ext2_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
{
struct inode * inode;
int err = -EMLINK;
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 @@ -1768,7 +1768,7 @@ static int ext3_mknod (struct inode * dir, struct dentry *dentry,
return err;
}

static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode)
static int ext3_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
{
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 @@ -1806,7 +1806,7 @@ static int ext4_mknod(struct inode *dir, struct dentry *dentry,
return err;
}

static int ext4_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
handle_t *handle;
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/fat/namei_msdos.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ static int msdos_rmdir(struct inode *dir, struct dentry *dentry)
}

/***** Make a directory */
static int msdos_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int msdos_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
struct super_block *sb = dir->i_sb;
struct fat_slot_info sinfo;
Expand Down
2 changes: 1 addition & 1 deletion fs/fat/namei_vfat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ static int vfat_unlink(struct inode *dir, struct dentry *dentry)
return err;
}

static int vfat_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int vfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
struct super_block *sb = dir->i_sb;
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 @@ -585,7 +585,7 @@ static int fuse_create(struct inode *dir, struct dentry *entry, int mode,
return fuse_mknod(dir, entry, mode, 0);
}

static int fuse_mkdir(struct inode *dir, struct dentry *entry, int mode)
static int fuse_mkdir(struct inode *dir, struct dentry *entry, umode_t mode)
{
struct fuse_mkdir_in inarg;
struct fuse_conn *fc = get_fuse_conn(dir);
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 @@ -1129,7 +1129,7 @@ static int gfs2_symlink(struct inode *dir, struct dentry *dentry,
* Returns: errno
*/

static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
return gfs2_create_inode(dir, dentry, S_IFDIR | mode, 0, NULL, 0, 0);
}
Expand Down
2 changes: 1 addition & 1 deletion fs/hfs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ static int hfs_create(struct inode *dir, struct dentry *dentry, int mode,
* in a directory, given the inode for the parent directory and the
* name (and its length) of the new directory.
*/
static int hfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int hfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
struct inode *inode;
int res;
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 @@ -459,7 +459,7 @@ static int hfsplus_create(struct inode *dir, struct dentry *dentry, int mode,
return hfsplus_mknod(dir, dentry, mode, 0);
}

static int hfsplus_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int hfsplus_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
return hfsplus_mknod(dir, dentry, mode | S_IFDIR, 0);
}
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 @@ -676,7 +676,7 @@ int hostfs_symlink(struct inode *ino, struct dentry *dentry, const char *to)
return err;
}

int hostfs_mkdir(struct inode *ino, struct dentry *dentry, int mode)
int hostfs_mkdir(struct inode *ino, struct dentry *dentry, umode_t mode)
{
char *file;
int err;
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 @@ -8,7 +8,7 @@
#include <linux/sched.h>
#include "hpfs_fn.h"

static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
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 @@ -523,7 +523,7 @@ static int hugetlbfs_mknod(struct inode *dir,
return error;
}

static int hugetlbfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int hugetlbfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
int retval = hugetlbfs_mknod(dir, dentry, mode | S_IFDIR, 0);
if (!retval)
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 @@ -29,7 +29,7 @@ static struct dentry *jffs2_lookup (struct inode *,struct dentry *,
static int jffs2_link (struct dentry *,struct inode *,struct dentry *);
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_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_rename (struct inode *, struct dentry *,
Expand Down Expand Up @@ -450,7 +450,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char
}


static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode)
static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, umode_t mode)
{
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 @@ -205,7 +205,7 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
* note:
* EACCESS: user needs search+write permission on the parent directory
*/
static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
static int jfs_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
{
int rc = 0;
tid_t tid; /* transaction id */
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 @@ -482,7 +482,7 @@ static int __logfs_create(struct inode *dir, struct dentry *dentry,
return ret;
}

static int logfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
static int logfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{
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 @@ -103,7 +103,7 @@ static int minix_link(struct dentry * old_dentry, struct inode * dir,
return add_nondir(dentry, inode);
}

static int minix_mkdir(struct inode * dir, struct dentry *dentry, int mode)
static int minix_mkdir(struct inode * dir, struct dentry *dentry, umode_t mode)
{
struct inode * inode;
int err = -EMLINK;
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 @@ -2541,7 +2541,7 @@ SYSCALL_DEFINE3(mknod, const char __user *, filename, umode_t, mode, unsigned, d
return sys_mknodat(AT_FDCWD, filename, mode, dev);
}

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

Expand Down
Loading

0 comments on commit 18bb1db

Please sign in to comment.