From 52b680c81238ea14693ab893d5d32a4d1c0a987d Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Wed, 17 Jun 2009 16:26:25 -0700 Subject: isofs: let mode and dmode mount options override rock ridge mode setting So far, permissions set via 'mode' and/or 'dmode' mount options were effective only if the medium had no rock ridge extensions (or was mounted without them). Add 'overriderockmode' mount option to indicate that these options should override permissions set in rock ridge extensions. Maybe this should be default but the current behavior is there since mount options were created so I think we should not change how they behave. Cc: Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/isofs/isofs.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'fs/isofs/isofs.h') diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h index ccbf72faf27a..9679fbcbfc03 100644 --- 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; -- cgit v1.2.2