From ff2768d49e6a059b264eec9bc5b0125a499863d2 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 26 Jul 2011 02:49:13 -0400
Subject: [PATCH] --- yaml --- r: 280230 b: refs/heads/master c:
 6a9a06d9ca3d307bd83d93e442ad964f5de7ec2c h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ufs/ialloc.c | 2 +-
 trunk/fs/ufs/inode.c  | 4 ++--
 trunk/fs/ufs/ufs.h    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 69b75a8f0306..d055d6503ff6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f45ba3d101fd882ed122059e6797786c81e2c17
+refs/heads/master: 6a9a06d9ca3d307bd83d93e442ad964f5de7ec2c
diff --git a/trunk/fs/ufs/ialloc.c b/trunk/fs/ufs/ialloc.c
index 78a4c70d46b5..4ec5c1085a87 100644
--- a/trunk/fs/ufs/ialloc.c
+++ b/trunk/fs/ufs/ialloc.c
@@ -170,7 +170,7 @@ static void ufs2_init_inodes_chunk(struct super_block *sb,
  * For other inodes, search forward from the parent directory's block
  * group to find a free inode.
  */
-struct inode * ufs_new_inode(struct inode * dir, int mode)
+struct inode *ufs_new_inode(struct inode *dir, umode_t mode)
 {
 	struct super_block * sb;
 	struct ufs_sb_info * sbi;
diff --git a/trunk/fs/ufs/inode.c b/trunk/fs/ufs/inode.c
index 879b13436fa4..9094e1d917be 100644
--- a/trunk/fs/ufs/inode.c
+++ b/trunk/fs/ufs/inode.c
@@ -583,7 +583,7 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode)
 {
 	struct ufs_inode_info *ufsi = UFS_I(inode);
 	struct super_block *sb = inode->i_sb;
-	mode_t mode;
+	umode_t mode;
 
 	/*
 	 * Copy data to the in-core inode.
@@ -630,7 +630,7 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode)
 {
 	struct ufs_inode_info *ufsi = UFS_I(inode);
 	struct super_block *sb = inode->i_sb;
-	mode_t mode;
+	umode_t mode;
 
 	UFSD("Reading ufs2 inode, ino %lu\n", inode->i_ino);
 	/*
diff --git a/trunk/fs/ufs/ufs.h b/trunk/fs/ufs/ufs.h
index c26f2bcec264..528750b7e701 100644
--- a/trunk/fs/ufs/ufs.h
+++ b/trunk/fs/ufs/ufs.h
@@ -104,7 +104,7 @@ extern const struct address_space_operations ufs_aops;
 
 /* ialloc.c */
 extern void ufs_free_inode (struct inode *inode);
-extern struct inode * ufs_new_inode (struct inode *, int);
+extern struct inode * ufs_new_inode (struct inode *, umode_t);
 
 /* inode.c */
 extern struct inode *ufs_iget(struct super_block *, unsigned long);