summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-07-26 03:16:55 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-03 22:55:07 -0500
commit632861f05a8e5878a267d173000880ceb608b56e (patch)
tree1b79f6fd729d7f5253c98afaad2d2776b30e59aa
parent09208d150b5cda009b666238a7102cb45ecec2ee (diff)
pohmelfs: propagate umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--drivers/staging/pohmelfs/dir.c7
-rw-r--r--drivers/staging/pohmelfs/netfs.h2
-rw-r--r--fs/ramfs/inode.c2
-rw-r--r--include/linux/ramfs.h2
4 files changed, 7 insertions, 6 deletions
diff --git a/drivers/staging/pohmelfs/dir.c b/drivers/staging/pohmelfs/dir.c
index c33e959b6efe..2ee4491b7136 100644
--- a/drivers/staging/pohmelfs/dir.c
+++ b/drivers/staging/pohmelfs/dir.c
@@ -590,13 +590,13 @@ out:
590 * during writeback for given inode. 590 * during writeback for given inode.
591 */ 591 */
592struct pohmelfs_inode *pohmelfs_create_entry_local(struct pohmelfs_sb *psb, 592struct pohmelfs_inode *pohmelfs_create_entry_local(struct pohmelfs_sb *psb,
593 struct pohmelfs_inode *parent, struct qstr *str, u64 start, int mode) 593 struct pohmelfs_inode *parent, struct qstr *str, u64 start, umode_t mode)
594{ 594{
595 struct pohmelfs_inode *npi; 595 struct pohmelfs_inode *npi;
596 int err = -ENOMEM; 596 int err = -ENOMEM;
597 struct netfs_inode_info info; 597 struct netfs_inode_info info;
598 598
599 dprintk("%s: name: '%s', mode: %o, start: %llu.\n", 599 dprintk("%s: name: '%s', mode: %ho, start: %llu.\n",
600 __func__, str->name, mode, start); 600 __func__, str->name, mode, start);
601 601
602 info.mode = mode; 602 info.mode = mode;
@@ -630,7 +630,8 @@ err_out_unlock:
630/* 630/*
631 * Create local object and bind it to dentry. 631 * Create local object and bind it to dentry.
632 */ 632 */
633static int pohmelfs_create_entry(struct inode *dir, struct dentry *dentry, u64 start, int mode) 633static int pohmelfs_create_entry(struct inode *dir, struct dentry *dentry,
634 u64 start, umode_t mode)
634{ 635{
635 struct pohmelfs_sb *psb = POHMELFS_SB(dir->i_sb); 636 struct pohmelfs_sb *psb = POHMELFS_SB(dir->i_sb);
636 struct pohmelfs_inode *npi, *parent; 637 struct pohmelfs_inode *npi, *parent;
diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
index 985b6b755d5d..f26894f2a57f 100644
--- a/drivers/staging/pohmelfs/netfs.h
+++ b/drivers/staging/pohmelfs/netfs.h
@@ -776,7 +776,7 @@ struct pohmelfs_name *pohmelfs_search_hash(struct pohmelfs_inode *pi, u32 hash);
776void pohmelfs_inode_del_inode(struct pohmelfs_sb *psb, struct pohmelfs_inode *pi); 776void pohmelfs_inode_del_inode(struct pohmelfs_sb *psb, struct pohmelfs_inode *pi);
777 777
778struct pohmelfs_inode *pohmelfs_create_entry_local(struct pohmelfs_sb *psb, 778struct pohmelfs_inode *pohmelfs_create_entry_local(struct pohmelfs_sb *psb,
779 struct pohmelfs_inode *parent, struct qstr *str, u64 start, int mode); 779 struct pohmelfs_inode *parent, struct qstr *str, u64 start, umode_t mode);
780 780
781int pohmelfs_write_create_inode(struct pohmelfs_inode *pi); 781int pohmelfs_write_create_inode(struct pohmelfs_inode *pi);
782 782
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index 145680e9d581..aec766abe3af 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -52,7 +52,7 @@ static struct backing_dev_info ramfs_backing_dev_info = {
52}; 52};
53 53
54struct inode *ramfs_get_inode(struct super_block *sb, 54struct inode *ramfs_get_inode(struct super_block *sb,
55 const struct inode *dir, int mode, dev_t dev) 55 const struct inode *dir, umode_t mode, dev_t dev)
56{ 56{
57 struct inode * inode = new_inode(sb); 57 struct inode * inode = new_inode(sb);
58 58
diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h
index 3a8f0c9b2933..5bf5500db83d 100644
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
@@ -2,7 +2,7 @@
2#define _LINUX_RAMFS_H 2#define _LINUX_RAMFS_H
3 3
4struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir, 4struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir,
5 int mode, dev_t dev); 5 umode_t mode, dev_t dev);
6extern struct dentry *ramfs_mount(struct file_system_type *fs_type, 6extern struct dentry *ramfs_mount(struct file_system_type *fs_type,
7 int flags, const char *dev_name, void *data); 7 int flags, const char *dev_name, void *data);
8 8