mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z
This commit is contained in:
commit
ece2ccb668
375 changed files with 1008 additions and 1471 deletions
|
|
@ -112,7 +112,7 @@ out:
|
|||
*
|
||||
* Returns file type string.
|
||||
*/
|
||||
static inline const char *tomoyo_filetype(const mode_t mode)
|
||||
static inline const char *tomoyo_filetype(const umode_t mode)
|
||||
{
|
||||
switch (mode & S_IFMT) {
|
||||
case S_IFREG:
|
||||
|
|
@ -180,7 +180,7 @@ static char *tomoyo_print_header(struct tomoyo_request_info *r)
|
|||
for (i = 0; i < TOMOYO_MAX_PATH_STAT; i++) {
|
||||
struct tomoyo_mini_stat *stat;
|
||||
unsigned int dev;
|
||||
mode_t mode;
|
||||
umode_t mode;
|
||||
if (!obj->stat_valid[i])
|
||||
continue;
|
||||
stat = &obj->stat[i];
|
||||
|
|
|
|||
|
|
@ -564,7 +564,7 @@ struct tomoyo_mini_stat {
|
|||
uid_t uid;
|
||||
gid_t gid;
|
||||
ino_t ino;
|
||||
mode_t mode;
|
||||
umode_t mode;
|
||||
dev_t dev;
|
||||
dev_t rdev;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ static const struct file_operations tomoyo_operations = {
|
|||
*
|
||||
* Returns nothing.
|
||||
*/
|
||||
static void __init tomoyo_create_entry(const char *name, const mode_t mode,
|
||||
static void __init tomoyo_create_entry(const char *name, const umode_t mode,
|
||||
struct dentry *parent, const u8 key)
|
||||
{
|
||||
securityfs_create_file(name, mode, parent, ((u8 *) NULL) + key,
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
|
|||
* Returns 0 on success, negative value otherwise.
|
||||
*/
|
||||
static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
|
||||
int mode)
|
||||
umode_t mode)
|
||||
{
|
||||
struct path path = { parent->mnt, dentry };
|
||||
return tomoyo_path_number_perm(TOMOYO_TYPE_MKDIR, &path,
|
||||
|
|
@ -234,7 +234,7 @@ static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
|
|||
* Returns 0 on success, negative value otherwise.
|
||||
*/
|
||||
static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
|
||||
int mode, unsigned int dev)
|
||||
umode_t mode, unsigned int dev)
|
||||
{
|
||||
struct path path = { parent->mnt, dentry };
|
||||
int type = TOMOYO_TYPE_CREATE;
|
||||
|
|
@ -360,7 +360,7 @@ static int tomoyo_file_ioctl(struct file *file, unsigned int cmd,
|
|||
* Returns 0 on success, negative value otherwise.
|
||||
*/
|
||||
static int tomoyo_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
|
||||
mode_t mode)
|
||||
umode_t mode)
|
||||
{
|
||||
struct path path = { mnt, dentry };
|
||||
return tomoyo_path_number_perm(TOMOYO_TYPE_CHMOD, &path,
|
||||
|
|
|
|||
Loading…
Reference in a new issue