mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits) reiserfs: Properly display mount options in /proc/mounts vfs: prevent remount read-only if pending removes vfs: count unlinked inodes vfs: protect remounting superblock read-only vfs: keep list of mounts for each superblock vfs: switch ->show_options() to struct dentry * vfs: switch ->show_path() to struct dentry * vfs: switch ->show_devname() to struct dentry * vfs: switch ->show_stats to struct dentry * switch security_path_chmod() to struct path * vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb vfs: trim includes a bit switch mnt_namespace ->root to struct mount vfs: take /proc/*/mounts and friends to fs/proc_namespace.c vfs: opencode mntget() mnt_set_mountpoint() vfs: spread struct mount - remaining argument of next_mnt() vfs: move fsnotify junk to struct mount vfs: move mnt_devname vfs: move mnt_list to struct mount vfs: switch pnode.h macros to struct mount * ...
This commit is contained in:
commit
972b2c7199
476 changed files with 2588 additions and 2879 deletions
|
|
@ -3659,7 +3659,7 @@ static struct kobj_type cm_port_obj_type = {
|
|||
.release = cm_release_port_obj
|
||||
};
|
||||
|
||||
static char *cm_devnode(struct device *dev, mode_t *mode)
|
||||
static char *cm_devnode(struct device *dev, umode_t *mode)
|
||||
{
|
||||
if (mode)
|
||||
*mode = 0666;
|
||||
|
|
|
|||
|
|
@ -1175,7 +1175,7 @@ static void ib_umad_remove_one(struct ib_device *device)
|
|||
kref_put(&umad_dev->ref, ib_umad_release_dev);
|
||||
}
|
||||
|
||||
static char *umad_devnode(struct device *dev, mode_t *mode)
|
||||
static char *umad_devnode(struct device *dev, umode_t *mode)
|
||||
{
|
||||
return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -846,7 +846,7 @@ static void ib_uverbs_remove_one(struct ib_device *device)
|
|||
kfree(uverbs_dev);
|
||||
}
|
||||
|
||||
static char *uverbs_devnode(struct device *dev, mode_t *mode)
|
||||
static char *uverbs_devnode(struct device *dev, umode_t *mode)
|
||||
{
|
||||
if (mode)
|
||||
*mode = 0666;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
static struct super_block *ipath_super;
|
||||
|
||||
static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,
|
||||
int mode, const struct file_operations *fops,
|
||||
umode_t mode, const struct file_operations *fops,
|
||||
void *data)
|
||||
{
|
||||
int error;
|
||||
|
|
@ -61,7 +61,7 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,
|
|||
inode->i_mode = mode;
|
||||
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
|
||||
inode->i_private = data;
|
||||
if ((mode & S_IFMT) == S_IFDIR) {
|
||||
if (S_ISDIR(mode)) {
|
||||
inode->i_op = &simple_dir_inode_operations;
|
||||
inc_nlink(inode);
|
||||
inc_nlink(dir);
|
||||
|
|
@ -76,7 +76,7 @@ bail:
|
|||
return error;
|
||||
}
|
||||
|
||||
static int create_file(const char *name, mode_t mode,
|
||||
static int create_file(const char *name, umode_t mode,
|
||||
struct dentry *parent, struct dentry **dentry,
|
||||
const struct file_operations *fops, void *data)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ static struct super_block *qib_super;
|
|||
#define private2dd(file) ((file)->f_dentry->d_inode->i_private)
|
||||
|
||||
static int qibfs_mknod(struct inode *dir, struct dentry *dentry,
|
||||
int mode, const struct file_operations *fops,
|
||||
umode_t mode, const struct file_operations *fops,
|
||||
void *data)
|
||||
{
|
||||
int error;
|
||||
|
|
@ -67,7 +67,7 @@ static int qibfs_mknod(struct inode *dir, struct dentry *dentry,
|
|||
inode->i_mtime = inode->i_atime;
|
||||
inode->i_ctime = inode->i_atime;
|
||||
inode->i_private = data;
|
||||
if ((mode & S_IFMT) == S_IFDIR) {
|
||||
if (S_ISDIR(mode)) {
|
||||
inode->i_op = &simple_dir_inode_operations;
|
||||
inc_nlink(inode);
|
||||
inc_nlink(dir);
|
||||
|
|
@ -82,7 +82,7 @@ bail:
|
|||
return error;
|
||||
}
|
||||
|
||||
static int create_file(const char *name, mode_t mode,
|
||||
static int create_file(const char *name, umode_t mode,
|
||||
struct dentry *parent, struct dentry **dentry,
|
||||
const struct file_operations *fops, void *data)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -638,7 +638,7 @@ iscsi_iser_ep_disconnect(struct iscsi_endpoint *ep)
|
|||
iser_conn_terminate(ib_conn);
|
||||
}
|
||||
|
||||
static mode_t iser_attr_is_visible(int param_type, int param)
|
||||
static umode_t iser_attr_is_visible(int param_type, int param)
|
||||
{
|
||||
switch (param_type) {
|
||||
case ISCSI_HOST_PARAM:
|
||||
|
|
|
|||
Loading…
Reference in a new issue