diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 03:20:46 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:08 -0500 |
| commit | d0c00d0671fbbaf6c5e192544de551a6ea5c8833 (patch) | |
| tree | f8402b28350cea573d5b5db26caa509c91c446c4 /fs/ntfs | |
| parent | 7328bdd6cf5e032a2c54e4b1cf555ff769af08e7 (diff) | |
| download | linux-stable-d0c00d0671fbbaf6c5e192544de551a6ea5c8833.tar.gz linux-stable-d0c00d0671fbbaf6c5e192544de551a6ea5c8833.tar.bz2 linux-stable-d0c00d0671fbbaf6c5e192544de551a6ea5c8833.zip | |
ntfs: propagate umode_t
same story as with isofs and udf...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/super.c | 6 | ||||
| -rw-r--r-- | fs/ntfs/volume.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index b52706da4645..608be4516091 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c @@ -104,7 +104,7 @@ static bool parse_options(ntfs_volume *vol, char *opt) int errors = 0, sloppy = 0; uid_t uid = (uid_t)-1; gid_t gid = (gid_t)-1; - mode_t fmask = (mode_t)-1, dmask = (mode_t)-1; + umode_t fmask = (umode_t)-1, dmask = (umode_t)-1; int mft_zone_multiplier = -1, on_errors = -1; int show_sys_files = -1, case_sensitive = -1, disable_sparse = -1; struct nls_table *nls_map = NULL, *old_nls; @@ -287,9 +287,9 @@ no_mount_options: vol->uid = uid; if (gid != (gid_t)-1) vol->gid = gid; - if (fmask != (mode_t)-1) + if (fmask != (umode_t)-1) vol->fmask = fmask; - if (dmask != (mode_t)-1) + if (dmask != (umode_t)-1) vol->dmask = dmask; if (show_sys_files != -1) { if (show_sys_files) diff --git a/fs/ntfs/volume.h b/fs/ntfs/volume.h index 406ab55dfb32..15e3ba8d521a 100644 --- a/fs/ntfs/volume.h +++ b/fs/ntfs/volume.h @@ -48,8 +48,8 @@ typedef struct { unsigned long flags; /* Miscellaneous flags, see below. */ uid_t uid; /* uid that files will be mounted as. */ gid_t gid; /* gid that files will be mounted as. */ - mode_t fmask; /* The mask for file permissions. */ - mode_t dmask; /* The mask for directory + umode_t fmask; /* The mask for file permissions. */ + umode_t dmask; /* The mask for directory permissions. */ u8 mft_zone_multiplier; /* Initial mft zone multiplier. */ u8 on_errors; /* What to do on filesystem errors. */ |