mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -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
|
|
@ -20,7 +20,6 @@
|
|||
#include <linux/cramfs_fs.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/cramfs_fs_sb.h>
|
||||
#include <linux/buffer_head.h>
|
||||
#include <linux/vfs.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
|
|
@ -378,7 +377,7 @@ static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
|||
unsigned long nextoffset;
|
||||
char *name;
|
||||
ino_t ino;
|
||||
mode_t mode;
|
||||
umode_t mode;
|
||||
int namelen, error;
|
||||
|
||||
mutex_lock(&read_mutex);
|
||||
|
|
|
|||
Loading…
Reference in a new issue