ntfs: propagate umode_t

same story as with isofs and udf...

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

diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index b52706da4645267675241e8fc6a69cc80c48ace1..608be45160912944ccfc630a5e28bb5ae50eca45 100644 (file)
--- 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 406ab55dfb32a89575e172ce56a4dc5ced3c5c00..15e3ba8d521a3ba1e9095374ebea75becab48ebd 100644 (file)
--- 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. */