Commit 11c302c1 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  JFS: Fix conflicting superblock flags
parents 33530261 36b12fb7
...@@ -29,31 +29,21 @@ ...@@ -29,31 +29,21 @@
/* /*
* file system option (superblock flag) * file system option (superblock flag)
*/ */
/* mount time flag to disable journaling to disk */
#define JFS_NOINTEGRITY 0x00000010 /* directory option */
#define JFS_UNICODE 0x00000001 /* unicode name */
/* mount time flags for error handling */ /* mount time flags for error handling */
#define JFS_ERR_REMOUNT_RO 0x00000002 /* remount read-only */ #define JFS_ERR_REMOUNT_RO 0x00000002 /* remount read-only */
#define JFS_ERR_CONTINUE 0x00000004 /* continue */ #define JFS_ERR_CONTINUE 0x00000004 /* continue */
#define JFS_ERR_PANIC 0x00000008 /* panic */ #define JFS_ERR_PANIC 0x00000008 /* panic */
/* Quota support */
#define JFS_USRQUOTA 0x00000010 #define JFS_USRQUOTA 0x00000010
#define JFS_GRPQUOTA 0x00000020 #define JFS_GRPQUOTA 0x00000020
/* platform option (conditional compilation) */ /* mount time flag to disable journaling to disk */
#define JFS_AIX 0x80000000 /* AIX support */ #define JFS_NOINTEGRITY 0x00000040
/* POSIX name/directory support */
#define JFS_OS2 0x40000000 /* OS/2 support */
/* case-insensitive name/directory support */
#define JFS_DFS 0x20000000 /* DCE DFS LFS support */
#define JFS_LINUX 0x10000000 /* Linux support */
/* case-sensitive name/directory support */
/* directory option */
#define JFS_UNICODE 0x00000001 /* unicode name */
/* commit option */ /* commit option */
#define JFS_COMMIT 0x00000f00 /* commit option mask */ #define JFS_COMMIT 0x00000f00 /* commit option mask */
...@@ -61,6 +51,7 @@ ...@@ -61,6 +51,7 @@
#define JFS_LAZYCOMMIT 0x00000200 /* lazy commit */ #define JFS_LAZYCOMMIT 0x00000200 /* lazy commit */
#define JFS_TMPFS 0x00000400 /* temporary file system - #define JFS_TMPFS 0x00000400 /* temporary file system -
* do not log/commit: * do not log/commit:
* Never implemented
*/ */
/* log logical volume option */ /* log logical volume option */
...@@ -82,8 +73,17 @@ ...@@ -82,8 +73,17 @@
/* Directory index */ /* Directory index */
#define JFS_DIR_INDEX 0x00200000 /* Persistent index for */ #define JFS_DIR_INDEX 0x00200000 /* Persistent index for */
/* directory entries */
/* platform options */
#define JFS_LINUX 0x10000000 /* Linux support */
#define JFS_DFS 0x20000000 /* DCE DFS LFS support */
/* Never implemented */
#define JFS_OS2 0x40000000 /* OS/2 support */
/* case-insensitive name/directory support */
#define JFS_AIX 0x80000000 /* AIX support */
/* POSIX name/directory support - Never implemented*/
/* /*
* buffer cache configuration * buffer cache configuration
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment