diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 10:45:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 10:45:48 -0500 |
| commit | 11c302c14d8ddc47504bd3b650bc9e8da7c717b7 (patch) | |
| tree | 71f39a71ed889df3f3f91420dd2074b134ed0e40 | |
| parent | 335302618f47b43e1204d24a3edb65a3e5bc8c03 (diff) | |
| parent | 36b12fb709d229f277efbbe710031d5a429b2412 (diff) | |
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
| -rw-r--r-- | fs/jfs/jfs_filsys.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/fs/jfs/jfs_filsys.h b/fs/jfs/jfs_filsys.h index eb550b339bb8..38f70ac03bec 100644 --- a/fs/jfs/jfs_filsys.h +++ b/fs/jfs/jfs_filsys.h | |||
| @@ -29,31 +29,21 @@ | |||
| 29 | /* | 29 | /* |
| 30 | * file system option (superblock flag) | 30 | * file system option (superblock flag) |
| 31 | */ | 31 | */ |
| 32 | /* mount time flag to disable journaling to disk */ | 32 | |
| 33 | #define JFS_NOINTEGRITY 0x00000010 | 33 | /* directory option */ |
| 34 | #define JFS_UNICODE 0x00000001 /* unicode name */ | ||
| 34 | 35 | ||
| 35 | /* mount time flags for error handling */ | 36 | /* mount time flags for error handling */ |
| 36 | #define JFS_ERR_REMOUNT_RO 0x00000002 /* remount read-only */ | 37 | #define JFS_ERR_REMOUNT_RO 0x00000002 /* remount read-only */ |
| 37 | #define JFS_ERR_CONTINUE 0x00000004 /* continue */ | 38 | #define JFS_ERR_CONTINUE 0x00000004 /* continue */ |
| 38 | #define JFS_ERR_PANIC 0x00000008 /* panic */ | 39 | #define JFS_ERR_PANIC 0x00000008 /* panic */ |
| 39 | 40 | ||
| 41 | /* Quota support */ | ||
| 40 | #define JFS_USRQUOTA 0x00000010 | 42 | #define JFS_USRQUOTA 0x00000010 |
| 41 | #define JFS_GRPQUOTA 0x00000020 | 43 | #define JFS_GRPQUOTA 0x00000020 |
| 42 | 44 | ||
| 43 | /* platform option (conditional compilation) */ | 45 | /* mount time flag to disable journaling to disk */ |
| 44 | #define JFS_AIX 0x80000000 /* AIX support */ | 46 | #define JFS_NOINTEGRITY 0x00000040 |
| 45 | /* POSIX name/directory support */ | ||
| 46 | |||
| 47 | #define JFS_OS2 0x40000000 /* OS/2 support */ | ||
| 48 | /* case-insensitive name/directory support */ | ||
| 49 | |||
| 50 | #define JFS_DFS 0x20000000 /* DCE DFS LFS support */ | ||
| 51 | |||
| 52 | #define JFS_LINUX 0x10000000 /* Linux support */ | ||
| 53 | /* case-sensitive name/directory support */ | ||
| 54 | |||
| 55 | /* directory option */ | ||
| 56 | #define JFS_UNICODE 0x00000001 /* unicode name */ | ||
| 57 | 47 | ||
| 58 | /* commit option */ | 48 | /* commit option */ |
| 59 | #define JFS_COMMIT 0x00000f00 /* commit option mask */ | 49 | #define JFS_COMMIT 0x00000f00 /* commit option mask */ |
| @@ -61,6 +51,7 @@ | |||
| 61 | #define JFS_LAZYCOMMIT 0x00000200 /* lazy commit */ | 51 | #define JFS_LAZYCOMMIT 0x00000200 /* lazy commit */ |
| 62 | #define JFS_TMPFS 0x00000400 /* temporary file system - | 52 | #define JFS_TMPFS 0x00000400 /* temporary file system - |
| 63 | * do not log/commit: | 53 | * do not log/commit: |
| 54 | * Never implemented | ||
| 64 | */ | 55 | */ |
| 65 | 56 | ||
| 66 | /* log logical volume option */ | 57 | /* log logical volume option */ |
| @@ -74,16 +65,25 @@ | |||
| 74 | #define JFS_SPARSE 0x00020000 /* sparse regular file */ | 65 | #define JFS_SPARSE 0x00020000 /* sparse regular file */ |
| 75 | 66 | ||
| 76 | /* DASD Limits F226941 */ | 67 | /* DASD Limits F226941 */ |
| 77 | #define JFS_DASD_ENABLED 0x00040000 /* DASD limits enabled */ | 68 | #define JFS_DASD_ENABLED 0x00040000 /* DASD limits enabled */ |
| 78 | #define JFS_DASD_PRIME 0x00080000 /* Prime DASD usage on boot */ | 69 | #define JFS_DASD_PRIME 0x00080000 /* Prime DASD usage on boot */ |
| 79 | 70 | ||
| 80 | /* big endian flag */ | 71 | /* big endian flag */ |
| 81 | #define JFS_SWAP_BYTES 0x00100000 /* running on big endian computer */ | 72 | #define JFS_SWAP_BYTES 0x00100000 /* running on big endian computer */ |
| 82 | 73 | ||
| 83 | /* Directory index */ | 74 | /* Directory index */ |
| 84 | #define JFS_DIR_INDEX 0x00200000 /* Persistent index for */ | 75 | #define JFS_DIR_INDEX 0x00200000 /* Persistent index for */ |
| 85 | /* directory entries */ | ||
| 86 | 76 | ||
| 77 | /* platform options */ | ||
| 78 | #define JFS_LINUX 0x10000000 /* Linux support */ | ||
| 79 | #define JFS_DFS 0x20000000 /* DCE DFS LFS support */ | ||
| 80 | /* Never implemented */ | ||
| 81 | |||
| 82 | #define JFS_OS2 0x40000000 /* OS/2 support */ | ||
| 83 | /* case-insensitive name/directory support */ | ||
| 84 | |||
| 85 | #define JFS_AIX 0x80000000 /* AIX support */ | ||
| 86 | /* POSIX name/directory support - Never implemented*/ | ||
| 87 | 87 | ||
| 88 | /* | 88 | /* |
| 89 | * buffer cache configuration | 89 | * buffer cache configuration |