A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 19:51:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

isofs: implement dmode option

Browse source 
Implement dmode option for iso9660 filesystem to allow setting of access
rights for directories on the filesystem.

Signed-off-by: Jan Kara <[email protected]>
Cc: "Ilya N. Golubev" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Jan Kara 2008-02-08 04:21:09 -08:00 • committed by Linus Torvalds
commit 9b7880e7bb
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
fs/isofs/inode.c
View file

@ -144,7 +144,8 @@ struct iso9660_options{
char nocompress;
unsigned char check;
unsigned int blocksize;
mode_t mode;
mode_t fmode;
mode_t dmode;
gid_t gid;
uid_t uid;
char *iocharset;
@ -305,7 +306,7 @@ enum {
Opt_block, Opt_check_r, Opt_check_s, Opt_cruft, Opt_gid, Opt_ignore,
Opt_iocharset, Opt_map_a, Opt_map_n, Opt_map_o, Opt_mode, Opt_nojoliet,
Opt_norock, Opt_sb, Opt_session, Opt_uid, Opt_unhide, Opt_utf8, Opt_err,
Opt_nocompress, Opt_hide, Opt_showassoc,
Opt_nocompress, Opt_hide, Opt_showassoc, Opt_dmode,
};
static match_table_t tokens = {
@ -332,6 +333,7 @@ static match_table_t tokens = {
{Opt_uid, "uid=%u"},
{Opt_gid, "gid=%u"},
{Opt_mode, "mode=%u"},
{Opt_dmode, "dmode=%u"},
{Opt_block, "block=%u"},
{Opt_ignore, "conv=binary"},
{Opt_ignore, "conv=b"},
@ -359,7 +361,7 @@ static int parse_options(char *options, struct iso9660_options *popt)
popt->check = 'u'; /* unset */
popt->nocompress = 0;
popt->blocksize = 1024;
popt->mode = S_IRUGO | S_IXUGO; /*
popt->fmode = popt->dmode = S_IRUGO | S_IXUGO; /*
* r-x for all. The disc could
* be shared with DOS machines so
* virtually anything could be
@ -451,7 +453,12 @@ static int parse_options(char *options, struct iso9660_options *popt)
case Opt_mode:
if (match_int(&args[0], &option))
return 0;
popt->mode = option;
popt->fmode = option;
break;
case Opt_dmode:
if (match_int(&args[0], &option))
return 0;
popt->dmode = option;
break;
case Opt_block:
if (match_int(&args[0], &option))
@ -801,7 +808,8 @@ root_found:
* on the disk as suid, so we merely allow them to set the default
* permissions.
*/
sbi->s_mode = opt.mode & 0777;
sbi->s_fmode = opt.fmode & 0777;
sbi->s_dmode = opt.dmode & 0777;
/*
* Read the root inode, which _may_ result in changing
@ -1248,7 +1256,7 @@ static int isofs_read_inode(struct inode *inode)
ei->i_file_format = isofs_file_normal;
if (de->flags[-high_sierra] & 2) {
inode->i_mode = S_IRUGO | S_IXUGO | S_IFDIR;
inode->i_mode = sbi->s_dmode | S_IFDIR;
inode->i_nlink = 1; /*
* Set to 1. We know there are 2, but
* the find utility tries to optimize
@ -1258,9 +1266,8 @@ static int isofs_read_inode(struct inode *inode)
*/
} else {
/* Everybody gets to read the file. */
inode->i_mode = sbi->s_mode;
inode->i_mode = sbi->s_fmode | S_IFREG;
inode->i_nlink = 1;
inode->i_mode |= S_IFREG;
}
inode->i_uid = sbi->s_uid;
inode->i_gid = sbi->s_gid;

3
fs/isofs/isofs.h
View file

@ -51,7 +51,8 @@ struct isofs_sb_info {
unsigned char s_hide;
unsigned char s_showassoc;
mode_t s_mode;
mode_t s_fmode;
mode_t s_dmode;
gid_t s_gid;
uid_t s_uid;
struct nls_table *s_nls_iocharset; /* Native language support table */