Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ntfs: propagate umode_t

same story as with isofs and udf...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro d0c00d06 7328bdd6

+5 -5
+3 -3
fs/ntfs/super.c
··· 104 104 int errors = 0, sloppy = 0; 105 105 uid_t uid = (uid_t)-1; 106 106 gid_t gid = (gid_t)-1; 107 - mode_t fmask = (mode_t)-1, dmask = (mode_t)-1; 107 + umode_t fmask = (umode_t)-1, dmask = (umode_t)-1; 108 108 int mft_zone_multiplier = -1, on_errors = -1; 109 109 int show_sys_files = -1, case_sensitive = -1, disable_sparse = -1; 110 110 struct nls_table *nls_map = NULL, *old_nls; ··· 287 287 vol->uid = uid; 288 288 if (gid != (gid_t)-1) 289 289 vol->gid = gid; 290 - if (fmask != (mode_t)-1) 290 + if (fmask != (umode_t)-1) 291 291 vol->fmask = fmask; 292 - if (dmask != (mode_t)-1) 292 + if (dmask != (umode_t)-1) 293 293 vol->dmask = dmask; 294 294 if (show_sys_files != -1) { 295 295 if (show_sys_files)
+2 -2
fs/ntfs/volume.h
··· 48 48 unsigned long flags; /* Miscellaneous flags, see below. */ 49 49 uid_t uid; /* uid that files will be mounted as. */ 50 50 gid_t gid; /* gid that files will be mounted as. */ 51 - mode_t fmask; /* The mask for file permissions. */ 52 - mode_t dmask; /* The mask for directory 51 + umode_t fmask; /* The mask for file permissions. */ 52 + umode_t dmask; /* The mask for directory 53 53 permissions. */ 54 54 u8 mft_zone_multiplier; /* Initial mft zone multiplier. */ 55 55 u8 on_errors; /* What to do on filesystem errors. */