Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[~andy/linux] / fs / cifs / cifs_fs_sb.h

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;