lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Browse Source 
Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
This commit is contained in:
Trond Myklebust
2006-06-24 08:41:41 -04:00
parent 70ac4385a1 d384ea691f
commit 816724e65c
1993 changed files with 83871 additions and 82966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/mount.h
View File

@ -17,6 +17,11 @@
#include <linux/spinlock.h>
#include <asm/atomic.h>
struct super_block;
struct vfsmount;
struct dentry;
struct namespace;
#define MNT_NOSUID 0x01
#define MNT_NODEV 0x02
#define MNT_NOEXEC 0x04