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>

1 files changed, 9 insertions, 2 deletions

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 3c98c305d37d..1456d238f8f8 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) <<