From aad40d7c0f2de3de65a1742ba1888951dbfd3d30 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Jul 2011 02:46:57 -0400 Subject: [PATCH] --- yaml --- r: 280227 b: refs/heads/master c: 69b34f3ab30836bb736b5108f40bf76de9f656f3 h: refs/heads/master i: 280225: 56498234e1f1f78e0d69f346fa73bce5132e57f3 280223: fe78a4b7085cd56a182e0978235c015fde215fbc v: v3 --- [refs] | 2 +- trunk/fs/ext3/ialloc.c | 2 +- trunk/include/linux/ext3_fs.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c147153d9542..96bb1e5e8a58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ea40bc9471ae5a24b7e07cbf085fcd3c9572c91 +refs/heads/master: 69b34f3ab30836bb736b5108f40bf76de9f656f3 diff --git a/trunk/fs/ext3/ialloc.c b/trunk/fs/ext3/ialloc.c index 5c866e06e7ab..92cc86dfa23d 100644 --- a/trunk/fs/ext3/ialloc.c +++ b/trunk/fs/ext3/ialloc.c @@ -371,7 +371,7 @@ static int find_group_other(struct super_block *sb, struct inode *parent) * group to find a free inode. */ struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, - const struct qstr *qstr, int mode) + const struct qstr *qstr, umode_t mode) { struct super_block *sb; struct buffer_head *bitmap_bh = NULL; diff --git a/trunk/include/linux/ext3_fs.h b/trunk/include/linux/ext3_fs.h index dec99116a0e4..f957085d40ed 100644 --- a/trunk/include/linux/ext3_fs.h +++ b/trunk/include/linux/ext3_fs.h @@ -884,7 +884,7 @@ extern int ext3fs_dirhash(const char *name, int len, struct /* ialloc.c */ extern struct inode * ext3_new_inode (handle_t *, struct inode *, - const struct qstr *, int); + const struct qstr *, umode_t); extern void ext3_free_inode (handle_t *, struct inode *); extern struct inode * ext3_orphan_get (struct super_block *, unsigned long); extern unsigned long ext3_count_free_inodes (struct super_block *);