Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / s390 / block / dasd.c

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 2de5b60..eef27a1 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1072,7 +1072,7 @@ static const struct file_operations dasd_stats_global_fops = {
 static void dasd_profile_init(struct dasd_profile *profile,
                              struct dentry *base_dentry)
 {
-       mode_t mode;
+       umode_t mode;
        struct dentry *pde;
 
        if (!base_dentry)
@@ -1111,7 +1111,7 @@ static void dasd_statistics_removeroot(void)
 
 static void dasd_statistics_createroot(void)
 {
-       mode_t mode;
+       umode_t mode;
        struct dentry *pde;
 
        dasd_debugfs_root_entry = NULL;