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

This commit is contained in:
Al Viro
2012-01-06 23:15:54 -05:00
375 changed files with 1007 additions and 1470 deletions

View File

@@ -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);