From 3749634b90c76ba77b0ddfc5df6ea0570ab5cadb Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Tue, 2 Dec 2008 13:40:11 +0100
Subject: [PATCH] --- yaml --- r: 140012 b: refs/heads/master c:
 87bc730c07a0884d14d6af5c9d49f4669c0a0589 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/udf/inode.c  | 4 ++--
 trunk/fs/udf/super.c  | 8 ++++----
 trunk/fs/udf/udf_sb.h | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 0d23c83247ed..7715fc9e5d00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e650b94addfbf072952df762e6f1c6c9e26c4f9c
+refs/heads/master: 87bc730c07a0884d14d6af5c9d49f4669c0a0589
diff --git a/trunk/fs/udf/inode.c b/trunk/fs/udf/inode.c
index 1456d238f8f8..e7533f785636 100644
--- a/trunk/fs/udf/inode.c
+++ b/trunk/fs/udf/inode.c
@@ -1223,10 +1223,10 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
 	iinfo->i_lenExtents = inode->i_size;
 
 	if (fe->icbTag.fileType != ICBTAG_FILE_TYPE_DIRECTORY &&
-			sbi->s_fmode != -1)
+			sbi->s_fmode != UDF_INVALID_MODE)
 		inode->i_mode = sbi->s_fmode;
 	else if (fe->icbTag.fileType == ICBTAG_FILE_TYPE_DIRECTORY &&
-			sbi->s_dmode != -1)
+			sbi->s_dmode != UDF_INVALID_MODE)
 		inode->i_mode = sbi->s_dmode;
 	else
 		inode->i_mode = udf_convert_permissions(fe);
diff --git a/trunk/fs/udf/super.c b/trunk/fs/udf/super.c
index 0368bf60f42b..b9dc6adfdd2d 100644
--- a/trunk/fs/udf/super.c
+++ b/trunk/fs/udf/super.c
@@ -284,9 +284,9 @@ static int udf_show_options(struct seq_file *seq, struct vfsmount *mnt)
 		seq_printf(seq, ",gid=%u", sbi->s_gid);
 	if (sbi->s_umask != 0)
 		seq_printf(seq, ",umask=%o", sbi->s_umask);
-	if (sbi->s_fmode != -1)
+	if (sbi->s_fmode != UDF_INVALID_MODE)
 		seq_printf(seq, ",mode=%o", sbi->s_fmode);
-	if (sbi->s_dmode != -1)
+	if (sbi->s_dmode != UDF_INVALID_MODE)
 		seq_printf(seq, ",dmode=%o", sbi->s_dmode);
 	if (UDF_QUERY_FLAG(sb, UDF_FLAG_SESSION_SET))
 		seq_printf(seq, ",session=%u", sbi->s_session);
@@ -1892,8 +1892,8 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
 	uopt.uid = -1;
 	uopt.gid = -1;
 	uopt.umask = 0;
-	uopt.fmode = -1;
-	uopt.dmode = -1;
+	uopt.fmode = UDF_INVALID_MODE;
+	uopt.dmode = UDF_INVALID_MODE;
 
 	sbi = kzalloc(sizeof(struct udf_sb_info), GFP_KERNEL);
 	if (!sbi)
diff --git a/trunk/fs/udf/udf_sb.h b/trunk/fs/udf/udf_sb.h
index 5d32c609fceb..158221ecdc42 100644
--- a/trunk/fs/udf/udf_sb.h
+++ b/trunk/fs/udf/udf_sb.h
@@ -48,6 +48,8 @@
 #define UDF_SPARABLE_MAP15		0x1522U
 #define UDF_METADATA_MAP25		0x2511U
 
+#define UDF_INVALID_MODE		((mode_t)-1)
+
 #pragma pack(1) /* XXX(hch): Why?  This file just defines in-core structures */
 
 struct udf_meta_data {