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 1008 additions and 1471 deletions

View file

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