cifs: propagate umode_t

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

diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index 500d65859279eb817a7f14e478f789058339f182..c865bfdfe8190e19cdc6052e398ac1b2598783e6 100644 (file)
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -59,8 +59,8 @@ struct cifs_sb_info {
        gid_t   mnt_gid;
        uid_t   mnt_backupuid;
        gid_t   mnt_backupgid;
-       mode_t  mnt_file_mode;
-       mode_t  mnt_dir_mode;
+       umode_t mnt_file_mode;
+       umode_t mnt_dir_mode;
        unsigned int mnt_cifs_flags;
        char   *mountdata; /* options received at mount time or via DFS refs */
        struct backing_dev_info bdi;

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 8f1fe324162b4203fc245c9032052f6862623501..5bb961c13c4ddbd1361e4fdb8270835c4cc74e86 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -393,7 +393,7 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
        cifs_show_address(s, tcon->ses->server);
 
        if (!tcon->unix_ext)
-               seq_printf(s, ",file_mode=0%o,dir_mode=0%o",
+               seq_printf(s, ",file_mode=0%ho,dir_mode=0%ho",
                                           cifs_sb->mnt_file_mode,
                                           cifs_sb->mnt_dir_mode);
        if (tcon->seal)

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 8238aa13e01c0df9f90e991d0664c4e951449be1..ba53c1c6c6cc091f045de3769d7fd8d295de8ce6 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -169,8 +169,8 @@ struct smb_vol {
        gid_t linux_gid;
        uid_t backupuid;
        gid_t backupgid;
-       mode_t file_mode;
-       mode_t dir_mode;
+       umode_t file_mode;
+       umode_t dir_mode;
        unsigned secFlg;
        bool retry:1;
        bool intr:1;

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 8cd4b52d42174ee0a4d524d3176b59102751c61e..be1e8f91c0addb4cea120389d3151442afd9e495 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2819,7 +2819,7 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
                cifs_sb->mnt_backupgid = pvolume_info->backupgid;
        cifs_sb->mnt_file_mode = pvolume_info->file_mode;
        cifs_sb->mnt_dir_mode = pvolume_info->dir_mode;
-       cFYI(1, "file mode: 0x%x  dir mode: 0x%x",
+       cFYI(1, "file mode: 0x%hx  dir mode: 0x%hx",
                cifs_sb->mnt_file_mode, cifs_sb->mnt_dir_mode);
 
        cifs_sb->actimeo = pvolume_info->actimeo;