Merge tag 'to-linus' of git://github.com/rustyrussell/linux

[karo-tx-linux.git] / fs / cifs / cifsglob.h

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;