mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z
This commit is contained in:
commit
ece2ccb668
375 changed files with 1008 additions and 1471 deletions
|
|
@ -17,7 +17,6 @@
|
|||
#include <linux/ctype.h>
|
||||
#include <linux/major.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/buffer_head.h>
|
||||
#include <linux/hdreg.h>
|
||||
#include <linux/async.h>
|
||||
#include <linux/mutex.h>
|
||||
|
|
@ -1073,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)
|
||||
|
|
@ -1112,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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue