Commit 36b12fb7 authored by Dave Kleikamp's avatar Dave Kleikamp
Browse files

JFS: Fix conflicting superblock flags 



JFS_NOINTEGRITY and JFS_USRQUOTA are defined to be the same value.
Change JFS_NOINTEGRITY to 0x40 and re-order the flags in the header
file to avoid repeating this problem.

Signed-off-by: default avatarDave Kleikamp <shaggy@austin.ibm.com>
parent ec0bf39a

fs/jfs/jfs_filsys.h

+21 −21
Original line number Diff line number Diff line
@@ -29,31 +29,21 @@ 
/*

 *	 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 */

#define JFS_ERR_REMOUNT_RO 0x00000002   /* remount read-only */

#define JFS_ERR_CONTINUE   0x00000004   /* continue */

#define JFS_ERR_PANIC      0x00000008   /* panic */



/* Quota support */

#define	JFS_USRQUOTA	0x00000010

#define	JFS_GRPQUOTA	0x00000020



/* platform option (conditional compilation) */

#define JFS_AIX		0x80000000	/* AIX support */

/*	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 */

/* mount time flag to disable journaling to disk */

#define JFS_NOINTEGRITY 0x00000040



/* commit option */

#define	JFS_COMMIT	0x00000f00	/* commit option mask */
@@ -61,6 +51,7 @@ 
#define	JFS_LAZYCOMMIT	0x00000200	/* lazy commit */

#define	JFS_TMPFS	0x00000400	/* temporary file system -

					 * do not log/commit:

					 * Never implemented

					 */



/* log logical volume option */
@@ -82,8 +73,17 @@ 


/* Directory index */

#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