Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
+21
-21
fs/jfs/jfs_filsys.h
+21
-21
fs/jfs/jfs_filsys.h
···
29
29
/*
30
30
* file system option (superblock flag)
31
31
*/
32
-
/* mount time flag to disable journaling to disk */
33
-
#define JFS_NOINTEGRITY 0x00000010
32
+
33
+
/* directory option */
34
+
#define JFS_UNICODE 0x00000001 /* unicode name */
34
35
35
36
/* mount time flags for error handling */
36
37
#define JFS_ERR_REMOUNT_RO 0x00000002 /* remount read-only */
37
38
#define JFS_ERR_CONTINUE 0x00000004 /* continue */
38
39
#define JFS_ERR_PANIC 0x00000008 /* panic */
39
40
41
+
/* Quota support */
40
42
#define JFS_USRQUOTA 0x00000010
41
43
#define JFS_GRPQUOTA 0x00000020
42
44
43
-
/* platform option (conditional compilation) */
44
-
#define JFS_AIX 0x80000000 /* AIX support */
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 */
45
+
/* mount time flag to disable journaling to disk */
46
+
#define JFS_NOINTEGRITY 0x00000040
57
47
58
48
/* commit option */
59
49
#define JFS_COMMIT 0x00000f00 /* commit option mask */
···
51
61
#define JFS_LAZYCOMMIT 0x00000200 /* lazy commit */
52
62
#define JFS_TMPFS 0x00000400 /* temporary file system -
53
63
* do not log/commit:
64
+
* Never implemented
54
65
*/
55
66
56
67
/* log logical volume option */
···
65
74
#define JFS_SPARSE 0x00020000 /* sparse regular file */
66
75
67
76
/* DASD Limits F226941 */
68
-
#define JFS_DASD_ENABLED 0x00040000 /* DASD limits enabled */
69
-
#define JFS_DASD_PRIME 0x00080000 /* Prime DASD usage on boot */
77
+
#define JFS_DASD_ENABLED 0x00040000 /* DASD limits enabled */
78
+
#define JFS_DASD_PRIME 0x00080000 /* Prime DASD usage on boot */
70
79
71
80
/* big endian flag */
72
-
#define JFS_SWAP_BYTES 0x00100000 /* running on big endian computer */
81
+
#define JFS_SWAP_BYTES 0x00100000 /* running on big endian computer */
73
82
74
83
/* Directory index */
75
-
#define JFS_DIR_INDEX 0x00200000 /* Persistent index for */
76
-
/* directory entries */
84
+
#define JFS_DIR_INDEX 0x00200000 /* Persistent index for */
77
85
86
+
/* platform options */
87
+
#define JFS_LINUX 0x10000000 /* Linux support */
88
+
#define JFS_DFS 0x20000000 /* DCE DFS LFS support */
89
+
/* Never implemented */
90
+
91
+
#define JFS_OS2 0x40000000 /* OS/2 support */
92
+
/* case-insensitive name/directory support */
93
+
94
+
#define JFS_AIX 0x80000000 /* AIX support */
95
+
/* POSIX name/directory support - Never implemented*/
78
96
79
97
/*
80
98
* buffer cache configuration