isofs: let mode and dmode mount options override rock ridge mode setting

[mv-sheeva.git] / fs / isofs / isofs.h

diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h
index ccbf72faf27ada523b4abf8d1fa2dc1f42283e1e..9679fbcbfc036110bd2cd29ec097f79d6c4e9535 100644 (file)
--- a/fs/isofs/isofs.h
+++ b/fs/isofs/isofs.h
@@ -50,6 +50,7 @@ struct isofs_sb_info {
        unsigned char s_nocompress;
        unsigned char s_hide;
        unsigned char s_showassoc;
+       unsigned char s_overriderockperm;
 
        mode_t s_fmode;
        mode_t s_dmode;
@@ -58,6 +59,8 @@ struct isofs_sb_info {
        struct nls_table *s_nls_iocharset; /* Native language support table */
 };
 
+#define ISOFS_INVALID_MODE ((mode_t) -1)
+
 static inline struct isofs_sb_info *ISOFS_SB(struct super_block *sb)
 {
        return sb->s_fs_info;