diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 15:19:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 15:19:57 -0500 |
commit | 972b2c719990f91eb3b2310d44ef8a2d38955a14 (patch) | |
tree | b25a250ec5bec4b7b6355d214642d8b57c5cab32 /arch/s390 | |
parent | 02550d61f49266930e674286379d3601006b2893 (diff) | |
parent | c3aa077648e147783a7a53b409578234647db853 (diff) |
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 *
...
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/hypfs/inode.c | 14 | ||||
-rw-r--r-- | arch/s390/include/asm/debug.h | 4 | ||||
-rw-r--r-- | arch/s390/include/asm/types.h | 2 | ||||
-rw-r--r-- | arch/s390/kernel/debug.c | 8 |
4 files changed, 13 insertions, 15 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 481f4f76f66..8a2a887478c 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
@@ -97,7 +97,7 @@ static void hypfs_delete_tree(struct dentry *root) | |||
97 | } | 97 | } |
98 | } | 98 | } |
99 | 99 | ||
100 | static struct inode *hypfs_make_inode(struct super_block *sb, int mode) | 100 | static struct inode *hypfs_make_inode(struct super_block *sb, umode_t mode) |
101 | { | 101 | { |
102 | struct inode *ret = new_inode(sb); | 102 | struct inode *ret = new_inode(sb); |
103 | 103 | ||
@@ -107,7 +107,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) | |||
107 | ret->i_uid = hypfs_info->uid; | 107 | ret->i_uid = hypfs_info->uid; |
108 | ret->i_gid = hypfs_info->gid; | 108 | ret->i_gid = hypfs_info->gid; |
109 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; | 109 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; |
110 | if (mode & S_IFDIR) | 110 | if (S_ISDIR(mode)) |
111 | set_nlink(ret, 2); | 111 | set_nlink(ret, 2); |
112 | } | 112 | } |
113 | return ret; | 113 | return ret; |
@@ -259,9 +259,9 @@ static int hypfs_parse_options(char *options, struct super_block *sb) | |||
259 | return 0; | 259 | return 0; |
260 | } | 260 | } |
261 | 261 | ||
262 | static int hypfs_show_options(struct seq_file *s, struct vfsmount *mnt) | 262 | static int hypfs_show_options(struct seq_file *s, struct dentry *root) |
263 | { | 263 | { |
264 | struct hypfs_sb_info *hypfs_info = mnt->mnt_sb->s_fs_info; | 264 | struct hypfs_sb_info *hypfs_info = root->d_sb->s_fs_info; |
265 | 265 | ||
266 | seq_printf(s, ",uid=%u", hypfs_info->uid); | 266 | seq_printf(s, ",uid=%u", hypfs_info->uid); |
267 | seq_printf(s, ",gid=%u", hypfs_info->gid); | 267 | seq_printf(s, ",gid=%u", hypfs_info->gid); |
@@ -333,7 +333,7 @@ static void hypfs_kill_super(struct super_block *sb) | |||
333 | 333 | ||
334 | static struct dentry *hypfs_create_file(struct super_block *sb, | 334 | static struct dentry *hypfs_create_file(struct super_block *sb, |
335 | struct dentry *parent, const char *name, | 335 | struct dentry *parent, const char *name, |
336 | char *data, mode_t mode) | 336 | char *data, umode_t mode) |
337 | { | 337 | { |
338 | struct dentry *dentry; | 338 | struct dentry *dentry; |
339 | struct inode *inode; | 339 | struct inode *inode; |
@@ -350,13 +350,13 @@ static struct dentry *hypfs_create_file(struct super_block *sb, | |||
350 | dentry = ERR_PTR(-ENOMEM); | 350 | dentry = ERR_PTR(-ENOMEM); |
351 | goto fail; | 351 | goto fail; |
352 | } | 352 | } |
353 | if (mode & S_IFREG) { | 353 | if (S_ISREG(mode)) { |
354 | inode->i_fop = &hypfs_file_ops; | 354 | inode->i_fop = &hypfs_file_ops; |
355 | if (data) | 355 | if (data) |
356 | inode->i_size = strlen(data); | 356 | inode->i_size = strlen(data); |
357 | else | 357 | else |
358 | inode->i_size = 0; | 358 | inode->i_size = 0; |
359 | } else if (mode & S_IFDIR) { | 359 | } else if (S_ISDIR(mode)) { |
360 | inode->i_op = &simple_dir_inode_operations; | 360 | inode->i_op = &simple_dir_inode_operations; |
361 | inode->i_fop = &simple_dir_operations; | 361 | inode->i_fop = &simple_dir_operations; |
362 | inc_nlink(parent->d_inode); | 362 | inc_nlink(parent->d_inode); |
diff --git a/arch/s390/include/asm/debug.h b/arch/s390/include/asm/debug.h index 18124b75a7a..9d88db1f55d 100644 --- a/arch/s390/include/asm/debug.h +++ b/arch/s390/include/asm/debug.h | |||
@@ -73,7 +73,7 @@ typedef struct debug_info { | |||
73 | struct dentry* debugfs_entries[DEBUG_MAX_VIEWS]; | 73 | struct dentry* debugfs_entries[DEBUG_MAX_VIEWS]; |
74 | struct debug_view* views[DEBUG_MAX_VIEWS]; | 74 | struct debug_view* views[DEBUG_MAX_VIEWS]; |
75 | char name[DEBUG_MAX_NAME_LEN]; | 75 | char name[DEBUG_MAX_NAME_LEN]; |
76 | mode_t mode; | 76 | umode_t mode; |
77 | } debug_info_t; | 77 | } debug_info_t; |
78 | 78 | ||
79 | typedef int (debug_header_proc_t) (debug_info_t* id, | 79 | typedef int (debug_header_proc_t) (debug_info_t* id, |
@@ -124,7 +124,7 @@ debug_info_t *debug_register(const char *name, int pages, int nr_areas, | |||
124 | int buf_size); | 124 | int buf_size); |
125 | 125 | ||
126 | debug_info_t *debug_register_mode(const char *name, int pages, int nr_areas, | 126 | debug_info_t *debug_register_mode(const char *name, int pages, int nr_areas, |
127 | int buf_size, mode_t mode, uid_t uid, | 127 | int buf_size, umode_t mode, uid_t uid, |
128 | gid_t gid); | 128 | gid_t gid); |
129 | 129 | ||
130 | void debug_unregister(debug_info_t* id); | 130 | void debug_unregister(debug_info_t* id); |
diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h index eeb52ccf499..05ebbcdbbf6 100644 --- a/arch/s390/include/asm/types.h +++ b/arch/s390/include/asm/types.h | |||
@@ -13,8 +13,6 @@ | |||
13 | 13 | ||
14 | #ifndef __ASSEMBLY__ | 14 | #ifndef __ASSEMBLY__ |
15 | 15 | ||
16 | typedef unsigned short umode_t; | ||
17 | |||
18 | /* A address type so that arithmetic can be done on it & it can be upgraded to | 16 | /* A address type so that arithmetic can be done on it & it can be upgraded to |
19 | 64 bit when necessary | 17 | 64 bit when necessary |
20 | */ | 18 | */ |
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index 5ad6bc078bf..6848828b962 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
@@ -74,7 +74,7 @@ static ssize_t debug_input(struct file *file, const char __user *user_buf, | |||
74 | static int debug_open(struct inode *inode, struct file *file); | 74 | static int debug_open(struct inode *inode, struct file *file); |
75 | static int debug_close(struct inode *inode, struct file *file); | 75 | static int debug_close(struct inode *inode, struct file *file); |
76 | static debug_info_t *debug_info_create(const char *name, int pages_per_area, | 76 | static debug_info_t *debug_info_create(const char *name, int pages_per_area, |
77 | int nr_areas, int buf_size, mode_t mode); | 77 | int nr_areas, int buf_size, umode_t mode); |
78 | static void debug_info_get(debug_info_t *); | 78 | static void debug_info_get(debug_info_t *); |
79 | static void debug_info_put(debug_info_t *); | 79 | static void debug_info_put(debug_info_t *); |
80 | static int debug_prolog_level_fn(debug_info_t * id, | 80 | static int debug_prolog_level_fn(debug_info_t * id, |
@@ -330,7 +330,7 @@ debug_info_free(debug_info_t* db_info){ | |||
330 | 330 | ||
331 | static debug_info_t* | 331 | static debug_info_t* |
332 | debug_info_create(const char *name, int pages_per_area, int nr_areas, | 332 | debug_info_create(const char *name, int pages_per_area, int nr_areas, |
333 | int buf_size, mode_t mode) | 333 | int buf_size, umode_t mode) |
334 | { | 334 | { |
335 | debug_info_t* rc; | 335 | debug_info_t* rc; |
336 | 336 | ||
@@ -688,7 +688,7 @@ debug_close(struct inode *inode, struct file *file) | |||
688 | */ | 688 | */ |
689 | 689 | ||
690 | debug_info_t *debug_register_mode(const char *name, int pages_per_area, | 690 | debug_info_t *debug_register_mode(const char *name, int pages_per_area, |
691 | int nr_areas, int buf_size, mode_t mode, | 691 | int nr_areas, int buf_size, umode_t mode, |
692 | uid_t uid, gid_t gid) | 692 | uid_t uid, gid_t gid) |
693 | { | 693 | { |
694 | debug_info_t *rc = NULL; | 694 | debug_info_t *rc = NULL; |
@@ -1090,7 +1090,7 @@ debug_register_view(debug_info_t * id, struct debug_view *view) | |||
1090 | int rc = 0; | 1090 | int rc = 0; |
1091 | int i; | 1091 | int i; |
1092 | unsigned long flags; | 1092 | unsigned long flags; |
1093 | mode_t mode; | 1093 | umode_t mode; |
1094 | struct dentry *pde; | 1094 | struct dentry *pde; |
1095 | 1095 | ||
1096 | if (!id) | 1096 | if (!id) |