From 3a6cde21084aaefd57960a22b60480cc00e8cf32 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 26 Jul 2011 03:19:52 -0400
Subject: [PATCH] --- yaml --- r: 280255 b: refs/heads/master c:
 7328bdd6cf5e032a2c54e4b1cf555ff769af08e7 h: refs/heads/master i:   280253:
 a264e65b62ef61c3c9c64429ddee834a5ad19687   280251:
 66daba7dbbcf4ef76f62f46ac1f8700f06782756   280247:
 f6bbc1b3c02366df3be3331b303b0bc088dd5d13   280239:
 0a91efc4df0e816b7bce5d9075291f5db6600178   280223:
 fe78a4b7085cd56a182e0978235c015fde215fbc   280191:
 5f8a72d3fd4dafdc1884c4c89315c5531eac64fb v: v3

---
 [refs]                 | 2 +-
 trunk/fs/isofs/inode.c | 4 ++--
 trunk/fs/isofs/isofs.h | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b320da06dfd9..27f94825c786 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faa17292fd3a5a80345511ea341a59ac40ab59dc
+refs/heads/master: 7328bdd6cf5e032a2c54e4b1cf555ff769af08e7
diff --git a/trunk/fs/isofs/inode.c b/trunk/fs/isofs/inode.c
index b71f6311a337..7b99f5f460be 100644
--- a/trunk/fs/isofs/inode.c
+++ b/trunk/fs/isofs/inode.c
@@ -169,8 +169,8 @@ struct iso9660_options{
 	unsigned char map;
 	unsigned char check;
 	unsigned int blocksize;
-	mode_t fmode;
-	mode_t dmode;
+	umode_t fmode;
+	umode_t dmode;
 	gid_t gid;
 	uid_t uid;
 	char *iocharset;
diff --git a/trunk/fs/isofs/isofs.h b/trunk/fs/isofs/isofs.h
index 7d33de84f52a..0e73f63d9274 100644
--- a/trunk/fs/isofs/isofs.h
+++ b/trunk/fs/isofs/isofs.h
@@ -50,14 +50,14 @@ struct isofs_sb_info {
 	unsigned int  s_uid_set:1;
 	unsigned int  s_gid_set:1;
 
-	mode_t s_fmode;
-	mode_t s_dmode;
+	umode_t s_fmode;
+	umode_t s_dmode;
 	gid_t s_gid;
 	uid_t s_uid;
 	struct nls_table *s_nls_iocharset; /* Native language support table */
 };
 
-#define ISOFS_INVALID_MODE ((mode_t) -1)
+#define ISOFS_INVALID_MODE ((umode_t) -1)
 
 static inline struct isofs_sb_info *ISOFS_SB(struct super_block *sb)
 {