Skip to content

Commit

Permalink
switch ->create() to umode_t
Browse files Browse the repository at this point in the history 
vfs_create() ignores everything outside of 16bit subset of its
mode argument; switching it to umode_t is obviously equivalent
and it's the only caller of the method

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jan 4, 2012
1 parent 18bb1db commit 4acdaf2
Show file tree
Hide file tree
Showing 54 changed files with 72 additions and 72 deletions.
2 changes: 1 addition & 1 deletion Documentation/filesystems/Locking
View file
Expand Up @@ -37,7 +37,7 @@ d_manage: no no yes (ref-walk) maybe

--------------------------- inode_operations ---------------------------
prototypes:
int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
int (*create) (struct inode *,struct dentry *,umode_t, struct nameidata *);
struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameid
ata *);
int (*link) (struct dentry *,struct inode *,struct dentry *);
Expand Down
2 changes: 1 addition & 1 deletion Documentation/filesystems/vfs.txt
View file
Expand Up @@ -341,7 +341,7 @@ This describes how the VFS can manipulate an inode in your
filesystem. As of kernel 2.6.22, the following members are defined:

struct inode_operations {
int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
int (*create) (struct inode *,struct dentry *, umode_t, struct nameidata *);
struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
int (*link) (struct dentry *,struct inode *,struct dentry *);
int (*unlink) (struct inode *,struct dentry *);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/pohmelfs/dir.c
View file
Expand Up @@ -661,7 +661,7 @@ static int pohmelfs_create_entry(struct inode *dir, struct dentry *dentry, u64 s
/*
* VFS create and mkdir callbacks.
*/
static int pohmelfs_create(struct inode *dir, struct dentry *dentry, int mode,
static int pohmelfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
return pohmelfs_create_entry(dir, dentry, 0, mode);
Expand Down
2 changes: 1 addition & 1 deletion fs/9p/vfs_inode.c
View file
Expand Up @@ -702,7 +702,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
*/

static int
v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode,
v9fs_vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
int err;
Expand Down
4 changes: 2 additions & 2 deletions fs/9p/vfs_inode_dotl.c
View file
Expand Up @@ -253,7 +253,7 @@ int v9fs_open_to_dotl_flags(int flags)
*/

static int
v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode,
v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
struct nameidata *nd)
{
int err = 0;
Expand Down Expand Up @@ -284,7 +284,7 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode,

name = (char *) dentry->d_name.name;
P9_DPRINTK(P9_DEBUG_VFS, "v9fs_vfs_create_dotl: name:%s flags:0x%x "
"mode:0x%x\n", name, flags, omode);
"mode:0x%hx\n", name, flags, omode);

dfid = v9fs_fid_lookup(dentry->d_parent);
if (IS_ERR(dfid)) {
Expand Down
2 changes: 1 addition & 1 deletion fs/affs/affs.h
View file
Expand Up @@ -156,7 +156,7 @@ extern void affs_free_bitmap(struct super_block *sb);
extern int affs_hash_name(struct super_block *sb, const u8 *name, unsigned int len);
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_create(struct inode *dir, struct dentry *dentry, umode_t mode, struct nameidata *);
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,
Expand Down
4 changes: 2 additions & 2 deletions fs/affs/namei.c
View file
Expand Up @@ -255,13 +255,13 @@ affs_unlink(struct inode *dir, struct dentry *dentry)
}

int
affs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *nd)
affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, struct nameidata *nd)
{
struct super_block *sb = dir->i_sb;
struct inode *inode;
int error;

pr_debug("AFFS: create(%lu,\"%.*s\",0%o)\n",dir->i_ino,(int)dentry->d_name.len,
pr_debug("AFFS: create(%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
Expand Up @@ -28,7 +28,7 @@ static int afs_d_delete(const struct dentry *dentry);
static void afs_d_release(struct dentry *dentry);
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,
static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd);
static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
static int afs_rmdir(struct inode *dir, struct dentry *dentry);
Expand Down Expand Up @@ -948,7 +948,7 @@ static int afs_unlink(struct inode *dir, struct dentry *dentry)
/*
* create a regular file on an AFS filesystem
*/
static int afs_create(struct inode *dir, struct dentry *dentry, int mode,
static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
struct afs_file_status status;
Expand All @@ -962,7 +962,7 @@ static int afs_create(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
2 changes: 1 addition & 1 deletion fs/bad_inode.c
View file
Expand Up @@ -173,7 +173,7 @@ static const struct file_operations bad_file_ops =
};

static int bad_inode_create (struct inode *dir, struct dentry *dentry,
int mode, struct nameidata *nd)
umode_t mode, struct nameidata *nd)
{
return -EIO;
}
Expand Down
2 changes: 1 addition & 1 deletion fs/bfs/dir.c
View file
Expand Up @@ -84,7 +84,7 @@ const struct file_operations bfs_dir_operations = {

extern void dump_imap(const char *, struct super_block *);

static int bfs_create(struct inode *dir, struct dentry *dentry, int mode,
static int bfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
int err;
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/inode.c
View file
Expand Up @@ -4665,7 +4665,7 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry,
}

static int btrfs_create(struct inode *dir, struct dentry *dentry,
int mode, struct nameidata *nd)
umode_t mode, struct nameidata *nd)
{
struct btrfs_trans_handle *trans;
struct btrfs_root *root = BTRFS_I(dir)->root;
Expand Down
2 changes: 1 addition & 1 deletion fs/ceph/dir.c
View file
Expand Up @@ -699,7 +699,7 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,
return err;
}

static int ceph_create(struct inode *dir, struct dentry *dentry, int mode,
static int ceph_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
dout("create in dir %p dentry %p name '%.*s'\n",
Expand Down
2 changes: 1 addition & 1 deletion fs/cifs/cifsfs.h
View file
Expand Up @@ -44,7 +44,7 @@ extern const struct address_space_operations cifs_addr_ops_smallbuf;
/* Functions related to inodes */
extern const struct inode_operations cifs_dir_inode_ops;
extern struct inode *cifs_root_iget(struct super_block *);
extern int cifs_create(struct inode *, struct dentry *, int,
extern int cifs_create(struct inode *, struct dentry *, umode_t,
struct nameidata *);
extern struct dentry *cifs_lookup(struct inode *, struct dentry *,
struct nameidata *);
Expand Down
2 changes: 1 addition & 1 deletion fs/cifs/dir.c
View file
Expand Up @@ -136,7 +136,7 @@ build_path_from_dentry(struct dentry *direntry)
/* Inode operations in similar order to how they appear in Linux file fs.h */

int
cifs_create(struct inode *inode, struct dentry *direntry, int mode,
cifs_create(struct inode *inode, struct dentry *direntry, umode_t mode,
struct nameidata *nd)
{
int rc = -ENOENT;
Expand Down
4 changes: 2 additions & 2 deletions fs/coda/dir.c
View file
Expand Up @@ -30,7 +30,7 @@
#include "coda_int.h"

/* dir inode-ops */
static int coda_create(struct inode *dir, struct dentry *new, int mode, struct nameidata *nd);
static int coda_create(struct inode *dir, struct dentry *new, umode_t mode, struct nameidata *nd);
static struct dentry *coda_lookup(struct inode *dir, struct dentry *target, struct nameidata *nd);
static int coda_link(struct dentry *old_dentry, struct inode *dir_inode,
struct dentry *entry);
Expand Down Expand Up @@ -191,7 +191,7 @@ static inline void coda_dir_drop_nlink(struct inode *dir)
}

/* creation routines: create, mknod, mkdir, link, symlink */
static int coda_create(struct inode *dir, struct dentry *de, int mode, struct nameidata *nd)
static int coda_create(struct inode *dir, struct dentry *de, umode_t mode, struct nameidata *nd)
{
int error;
const char *name=de->d_name.name;
Expand Down
2 changes: 1 addition & 1 deletion fs/ecryptfs/inode.c
View file
Expand Up @@ -267,7 +267,7 @@ static int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry,
*/
static int
ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry,
int mode, struct nameidata *nd)
umode_t mode, struct nameidata *nd)
{
struct inode *ecryptfs_inode;
int rc;
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/namei.c
View file
Expand Up @@ -59,7 +59,7 @@ static struct dentry *exofs_lookup(struct inode *dir, struct dentry *dentry,
return d_splice_alias(inode, dentry);
}

static int exofs_create(struct inode *dir, struct dentry *dentry, int mode,
static int exofs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
struct inode *inode = exofs_new_inode(dir, mode);
Expand Down
2 changes: 1 addition & 1 deletion fs/ext2/namei.c
View file
Expand Up @@ -94,7 +94,7 @@ struct dentry *ext2_get_parent(struct dentry *child)
* If the create succeeds, we fill in the inode information
* with d_instantiate().
*/
static int ext2_create (struct inode * dir, struct dentry * dentry, int mode, struct nameidata *nd)
static int ext2_create (struct inode * dir, struct dentry * dentry, umode_t mode, struct nameidata *nd)
{
struct inode *inode;

Expand Down
2 changes: 1 addition & 1 deletion fs/ext3/namei.c
View file
Expand Up @@ -1698,7 +1698,7 @@ static int ext3_add_nondir(handle_t *handle,
* If the create succeeds, we fill in the inode information
* with d_instantiate().
*/
static int ext3_create (struct inode * dir, struct dentry * dentry, int mode,
static int ext3_create (struct inode * dir, struct dentry * dentry, umode_t mode,
struct nameidata *nd)
{
handle_t *handle;
Expand Down
2 changes: 1 addition & 1 deletion fs/ext4/namei.c
View file
Expand Up @@ -1736,7 +1736,7 @@ static int ext4_add_nondir(handle_t *handle,
* If the create succeeds, we fill in the inode information
* with d_instantiate().
*/
static int ext4_create(struct inode *dir, struct dentry *dentry, int mode,
static int ext4_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
handle_t *handle;
Expand Down
2 changes: 1 addition & 1 deletion fs/fat/namei_msdos.c
View file
Expand Up @@ -264,7 +264,7 @@ static int msdos_add_entry(struct inode *dir, const unsigned char *name,
}

/***** Create a file */
static int msdos_create(struct inode *dir, struct dentry *dentry, int mode,
static int msdos_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
struct super_block *sb = dir->i_sb;
Expand Down
2 changes: 1 addition & 1 deletion fs/fat/namei_vfat.c
View file
Expand Up @@ -781,7 +781,7 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry,
return ERR_PTR(err);
}

static int vfat_create(struct inode *dir, struct dentry *dentry, int mode,
static int vfat_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
struct super_block *sb = dir->i_sb;
Expand Down
2 changes: 1 addition & 1 deletion fs/fuse/dir.c
View file
Expand Up @@ -573,7 +573,7 @@ static int fuse_mknod(struct inode *dir, struct dentry *entry, int mode,
return create_new_entry(fc, req, dir, entry, mode);
}

static int fuse_create(struct inode *dir, struct dentry *entry, int mode,
static int fuse_create(struct inode *dir, struct dentry *entry, umode_t mode,
struct nameidata *nd)
{
if (nd) {
Expand Down
2 changes: 1 addition & 1 deletion fs/gfs2/inode.c
View file
Expand Up @@ -760,7 +760,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
*/

static int gfs2_create(struct inode *dir, struct dentry *dentry,
int mode, struct nameidata *nd)
umode_t mode, struct nameidata *nd)
{
int excl = 0;
if (nd && (nd->flags & LOOKUP_EXCL))
Expand Down
2 changes: 1 addition & 1 deletion fs/hfs/dir.c
View file
Expand Up @@ -186,7 +186,7 @@ static int hfs_dir_release(struct inode *inode, struct file *file)
* a directory and return a corresponding inode, given the inode for
* the directory and the name (and its length) of the new file.
*/
static int hfs_create(struct inode *dir, struct dentry *dentry, int mode,
static int hfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/hfsplus/dir.c
View file
Expand Up @@ -453,7 +453,7 @@ static int hfsplus_mknod(struct inode *dir, struct dentry *dentry,
return res;
}

static int hfsplus_create(struct inode *dir, struct dentry *dentry, int mode,
static int hfsplus_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
return hfsplus_mknod(dir, dentry, mode, 0);
Expand Down
2 changes: 1 addition & 1 deletion fs/hostfs/hostfs_kern.c
View file
Expand Up @@ -551,7 +551,7 @@ static int read_name(struct inode *ino, char *name)
return 0;
}

int hostfs_create(struct inode *dir, struct dentry *dentry, int mode,
int hostfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/hpfs/namei.c
View file
Expand Up @@ -115,7 +115,7 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
return err;
}

static int hpfs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *nd)
static int hpfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, struct nameidata *nd)
{
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
Expand Up @@ -531,7 +531,7 @@ static int hugetlbfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mod
return retval;
}

static int hugetlbfs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *nd)
static int hugetlbfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, struct nameidata *nd)
{
return hugetlbfs_mknod(dir, dentry, mode | S_IFREG, 0);
}
Expand Down
6 changes: 3 additions & 3 deletions fs/jffs2/dir.c
View file
Expand Up @@ -22,7 +22,7 @@

static int jffs2_readdir (struct file *, void *, filldir_t);

static int jffs2_create (struct inode *,struct dentry *,int,
static int jffs2_create (struct inode *,struct dentry *,umode_t,
struct nameidata *);
static struct dentry *jffs2_lookup (struct inode *,struct dentry *,
struct nameidata *);
Expand Down Expand Up @@ -169,8 +169,8 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir)
/***********************************************************************/


static int jffs2_create(struct inode *dir_i, struct dentry *dentry, int mode,
struct nameidata *nd)
static int jffs2_create(struct inode *dir_i, struct dentry *dentry,
umode_t mode, struct nameidata *nd)
{
struct jffs2_raw_inode *ri;
struct jffs2_inode_info *f, *dir_f;
Expand Down
2 changes: 1 addition & 1 deletion fs/jfs/namei.c
View file
Expand Up @@ -72,7 +72,7 @@ static inline void free_ea_wmap(struct inode *inode)
* RETURN: Errors from subroutines
*
*/
static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
static int jfs_create(struct inode *dip, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
int rc = 0;
Expand Down
2 changes: 1 addition & 1 deletion fs/logfs/dir.c
View file
Expand Up @@ -501,7 +501,7 @@ static int logfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
return __logfs_create(dir, dentry, inode, NULL, 0);
}

static int logfs_create(struct inode *dir, struct dentry *dentry, int mode,
static int logfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
struct inode *inode;
Expand Down
2 changes: 1 addition & 1 deletion fs/minix/namei.c
View file
Expand Up @@ -54,7 +54,7 @@ static int minix_mknod(struct inode * dir, struct dentry *dentry, int mode, dev_
return error;
}

static int minix_create(struct inode * dir, struct dentry *dentry, int mode,
static int minix_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
return minix_mknod(dir, dentry, mode, 0);
Expand Down
2 changes: 1 addition & 1 deletion fs/namei.c
View file
Expand Up @@ -1976,7 +1976,7 @@ void unlock_rename(struct dentry *p1, struct dentry *p2)
}
}

int vfs_create(struct inode *dir, struct dentry *dentry, int mode,
int vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
int error = may_create(dir, dentry);
Expand Down
4 changes: 2 additions & 2 deletions fs/ncpfs/dir.c
View file
Expand Up @@ -30,7 +30,7 @@ static void ncp_do_readdir(struct file *, void *, filldir_t,

static int ncp_readdir(struct file *, void *, filldir_t);

static int ncp_create(struct inode *, struct dentry *, int, struct nameidata *);
static int ncp_create(struct inode *, struct dentry *, umode_t, struct nameidata *);
static struct dentry *ncp_lookup(struct inode *, struct dentry *, struct nameidata *);
static int ncp_unlink(struct inode *, struct dentry *);
static int ncp_mkdir(struct inode *, struct dentry *, umode_t);
Expand Down Expand Up @@ -979,7 +979,7 @@ int ncp_create_new(struct inode *dir, struct dentry *dentry, int mode,
return error;
}

static int ncp_create(struct inode *dir, struct dentry *dentry, int mode,
static int ncp_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct nameidata *nd)
{
return ncp_create_new(dir, dentry, mode, 0, 0);
Expand Down

0 comments on commit 4acdaf2

Please sign in to comment.