diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 04:47:14 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:15 -0500 |
commit | c6684b26854000d406c9fa0698443c50f2bf2cba (patch) | |
tree | 595f21cb41edf7255903120afec36ae70bf467b3 /arch | |
parent | 685dd2d5bea3e6368cea8002caf404d1b0b5c9f1 (diff) |
switch spufs guts to umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/include/asm/spu.h | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/inode.c | 16 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/spufs.h | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/syscalls.c | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/arch/powerpc/include/asm/spu.h b/arch/powerpc/include/asm/spu.h index 4e360bd4a35a..c52640089c93 100644 --- a/arch/powerpc/include/asm/spu.h +++ b/arch/powerpc/include/asm/spu.h | |||
@@ -237,7 +237,7 @@ extern long spu_sys_callback(struct spu_syscall_block *s); | |||
237 | struct file; | 237 | struct file; |
238 | struct spufs_calls { | 238 | struct spufs_calls { |
239 | long (*create_thread)(const char __user *name, | 239 | long (*create_thread)(const char __user *name, |
240 | unsigned int flags, mode_t mode, | 240 | unsigned int flags, umode_t mode, |
241 | struct file *neighbor); | 241 | struct file *neighbor); |
242 | long (*spu_run)(struct file *filp, __u32 __user *unpc, | 242 | long (*spu_run)(struct file *filp, __u32 __user *unpc, |
243 | __u32 __user *ustatus); | 243 | __u32 __user *ustatus); |
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index d85f8cbdc8b3..d4a094ca96f3 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c | |||
@@ -91,7 +91,7 @@ spufs_init_once(void *p) | |||
91 | } | 91 | } |
92 | 92 | ||
93 | static struct inode * | 93 | static struct inode * |
94 | spufs_new_inode(struct super_block *sb, int mode) | 94 | spufs_new_inode(struct super_block *sb, umode_t mode) |
95 | { | 95 | { |
96 | struct inode *inode; | 96 | struct inode *inode; |
97 | 97 | ||
@@ -123,7 +123,7 @@ spufs_setattr(struct dentry *dentry, struct iattr *attr) | |||
123 | 123 | ||
124 | static int | 124 | static int |
125 | spufs_new_file(struct super_block *sb, struct dentry *dentry, | 125 | spufs_new_file(struct super_block *sb, struct dentry *dentry, |
126 | const struct file_operations *fops, int mode, | 126 | const struct file_operations *fops, umode_t mode, |
127 | size_t size, struct spu_context *ctx) | 127 | size_t size, struct spu_context *ctx) |
128 | { | 128 | { |
129 | static const struct inode_operations spufs_file_iops = { | 129 | static const struct inode_operations spufs_file_iops = { |
@@ -193,7 +193,7 @@ static int spufs_rmdir(struct inode *parent, struct dentry *dir) | |||
193 | } | 193 | } |
194 | 194 | ||
195 | static int spufs_fill_dir(struct dentry *dir, | 195 | static int spufs_fill_dir(struct dentry *dir, |
196 | const struct spufs_tree_descr *files, int mode, | 196 | const struct spufs_tree_descr *files, umode_t mode, |
197 | struct spu_context *ctx) | 197 | struct spu_context *ctx) |
198 | { | 198 | { |
199 | struct dentry *dentry, *tmp; | 199 | struct dentry *dentry, *tmp; |
@@ -263,7 +263,7 @@ EXPORT_SYMBOL_GPL(spufs_context_fops); | |||
263 | 263 | ||
264 | static int | 264 | static int |
265 | spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags, | 265 | spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags, |
266 | int mode) | 266 | umode_t mode) |
267 | { | 267 | { |
268 | int ret; | 268 | int ret; |
269 | struct inode *inode; | 269 | struct inode *inode; |
@@ -446,7 +446,7 @@ spufs_set_affinity(unsigned int flags, struct spu_context *ctx, | |||
446 | 446 | ||
447 | static int | 447 | static int |
448 | spufs_create_context(struct inode *inode, struct dentry *dentry, | 448 | spufs_create_context(struct inode *inode, struct dentry *dentry, |
449 | struct vfsmount *mnt, int flags, int mode, | 449 | struct vfsmount *mnt, int flags, umode_t mode, |
450 | struct file *aff_filp) | 450 | struct file *aff_filp) |
451 | { | 451 | { |
452 | int ret; | 452 | int ret; |
@@ -520,7 +520,7 @@ out: | |||
520 | } | 520 | } |
521 | 521 | ||
522 | static int | 522 | static int |
523 | spufs_mkgang(struct inode *dir, struct dentry *dentry, int mode) | 523 | spufs_mkgang(struct inode *dir, struct dentry *dentry, umode_t mode) |
524 | { | 524 | { |
525 | int ret; | 525 | int ret; |
526 | struct inode *inode; | 526 | struct inode *inode; |
@@ -583,7 +583,7 @@ out: | |||
583 | 583 | ||
584 | static int spufs_create_gang(struct inode *inode, | 584 | static int spufs_create_gang(struct inode *inode, |
585 | struct dentry *dentry, | 585 | struct dentry *dentry, |
586 | struct vfsmount *mnt, int mode) | 586 | struct vfsmount *mnt, umode_t mode) |
587 | { | 587 | { |
588 | int ret; | 588 | int ret; |
589 | 589 | ||
@@ -611,7 +611,7 @@ out: | |||
611 | static struct file_system_type spufs_type; | 611 | static struct file_system_type spufs_type; |
612 | 612 | ||
613 | long spufs_create(struct path *path, struct dentry *dentry, | 613 | long spufs_create(struct path *path, struct dentry *dentry, |
614 | unsigned int flags, mode_t mode, struct file *filp) | 614 | unsigned int flags, umode_t mode, struct file *filp) |
615 | { | 615 | { |
616 | int ret; | 616 | int ret; |
617 | 617 | ||
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h index 099245f230b2..67852ade4c01 100644 --- a/arch/powerpc/platforms/cell/spufs/spufs.h +++ b/arch/powerpc/platforms/cell/spufs/spufs.h | |||
@@ -237,7 +237,7 @@ struct spufs_inode_info { | |||
237 | struct spufs_tree_descr { | 237 | struct spufs_tree_descr { |
238 | const char *name; | 238 | const char *name; |
239 | const struct file_operations *ops; | 239 | const struct file_operations *ops; |
240 | int mode; | 240 | umode_t mode; |
241 | size_t size; | 241 | size_t size; |
242 | }; | 242 | }; |
243 | 243 | ||
@@ -249,7 +249,7 @@ extern const struct spufs_tree_descr spufs_dir_debug_contents[]; | |||
249 | extern struct spufs_calls spufs_calls; | 249 | extern struct spufs_calls spufs_calls; |
250 | long spufs_run_spu(struct spu_context *ctx, u32 *npc, u32 *status); | 250 | long spufs_run_spu(struct spu_context *ctx, u32 *npc, u32 *status); |
251 | long spufs_create(struct path *nd, struct dentry *dentry, unsigned int flags, | 251 | long spufs_create(struct path *nd, struct dentry *dentry, unsigned int flags, |
252 | mode_t mode, struct file *filp); | 252 | umode_t mode, struct file *filp); |
253 | /* ELF coredump callbacks for writing SPU ELF notes */ | 253 | /* ELF coredump callbacks for writing SPU ELF notes */ |
254 | extern int spufs_coredump_extra_notes_size(void); | 254 | extern int spufs_coredump_extra_notes_size(void); |
255 | extern int spufs_coredump_extra_notes_write(struct file *file, loff_t *foffset); | 255 | extern int spufs_coredump_extra_notes_write(struct file *file, loff_t *foffset); |
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c index 71a5b5207266..8591bb62d7fc 100644 --- a/arch/powerpc/platforms/cell/spufs/syscalls.c +++ b/arch/powerpc/platforms/cell/spufs/syscalls.c | |||
@@ -60,7 +60,7 @@ out: | |||
60 | } | 60 | } |
61 | 61 | ||
62 | static long do_spu_create(const char __user *pathname, unsigned int flags, | 62 | static long do_spu_create(const char __user *pathname, unsigned int flags, |
63 | mode_t mode, struct file *neighbor) | 63 | umode_t mode, struct file *neighbor) |
64 | { | 64 | { |
65 | struct path path; | 65 | struct path path; |
66 | struct dentry *dentry; | 66 | struct dentry *dentry; |