mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -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
|
|
@ -209,7 +209,7 @@ void minix_free_inode(struct inode * inode)
|
|||
mark_buffer_dirty(bh);
|
||||
}
|
||||
|
||||
struct inode *minix_new_inode(const struct inode *dir, int mode, int *error)
|
||||
struct inode *minix_new_inode(const struct inode *dir, umode_t mode, int *error)
|
||||
{
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct minix_sb_info *sbi = minix_sb(sb);
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ static struct inode *minix_alloc_inode(struct super_block *sb)
|
|||
static void minix_i_callback(struct rcu_head *head)
|
||||
{
|
||||
struct inode *inode = container_of(head, struct inode, i_rcu);
|
||||
INIT_LIST_HEAD(&inode->i_dentry);
|
||||
kmem_cache_free(minix_inode_cachep, minix_i(inode));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ struct minix_sb_info {
|
|||
extern struct inode *minix_iget(struct super_block *, unsigned long);
|
||||
extern struct minix_inode * minix_V1_raw_inode(struct super_block *, ino_t, struct buffer_head **);
|
||||
extern struct minix2_inode * minix_V2_raw_inode(struct super_block *, ino_t, struct buffer_head **);
|
||||
extern struct inode * minix_new_inode(const struct inode *, int, int *);
|
||||
extern struct inode * minix_new_inode(const struct inode *, umode_t, int *);
|
||||
extern void minix_free_inode(struct inode * inode);
|
||||
extern unsigned long minix_count_free_inodes(struct super_block *sb);
|
||||
extern int minix_new_block(struct inode * inode);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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);
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue