diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2008-11-16 20:52:19 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2009-04-02 12:29:50 +0200 |
| commit | 7ac9bcd5da59dd96eb1153d3fc04c3471fa5c09d (patch) | |
| tree | e9c5470783e9ec098fb7a056d89872c9e225f5c3 /fs/udf/inode.c | |
| parent | 530f1a5e3e93a038a457faf716975ed19f82831d (diff) | |
| download | op-kernel-dev-7ac9bcd5da59dd96eb1153d3fc04c3471fa5c09d.zip op-kernel-dev-7ac9bcd5da59dd96eb1153d3fc04c3471fa5c09d.tar.gz | |
udf: implement mode and dmode mounting options
"dmode" allows overriding permissions of directories and
"mode" allows overriding permissions of files.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/inode.c')
| -rw-r--r-- | fs/udf/inode.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 3c98c30..1456d238 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1222,8 +1222,15 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) inode->i_size = le64_to_cpu(fe->informationLength); iinfo->i_lenExtents = inode->i_size; - inode->i_mode = udf_convert_permissions(fe); - inode->i_mode &= ~UDF_SB(inode->i_sb)->s_umask; + if (fe->icbTag.fileType != ICBTAG_FILE_TYPE_DIRECTORY && + sbi->s_fmode != -1) + inode->i_mode = sbi->s_fmode; + else if (fe->icbTag.fileType == ICBTAG_FILE_TYPE_DIRECTORY && + sbi->s_dmode != -1) + inode->i_mode = sbi->s_dmode; + else + inode->i_mode = udf_convert_permissions(fe); + inode->i_mode &= ~sbi->s_umask; if (iinfo->i_efe == 0) { inode->i_blocks = le64_to_cpu(fe->logicalBlocksRecorded) << |
