Currently only one bit left in s_mount_opt. Let's
double size it for future purposes.
Signed-off-by: Dmitry Monakhov <dmonakhov@xxxxxxxxxx>
---
fs/ext4/ext4.h | 62 +++++++++++++++++++++++++-------------------------
fs/ext4/ext4_jbd2.c | 2 +-
fs/ext4/super.c | 2 +-
3 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 874d169..b2c01a2 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -421,7 +421,7 @@ struct ext4_new_group_data {
* Mount options
*/
struct ext4_mount_options {
- unsigned long s_mount_opt;
+ unsigned long long s_mount_opt;
uid_t s_resuid;
gid_t s_resgid;
unsigned long s_commit_interval;
@@ -738,35 +738,35 @@ struct ext4_inode_info {
/*
* Mount flags
*/
-#define EXT4_MOUNT_OLDALLOC 0x00002 /* Don't use the new Orlov allocator */
-#define EXT4_MOUNT_GRPID 0x00004 /* Create files with directory's group */
-#define EXT4_MOUNT_DEBUG 0x00008 /* Some debugging messages */
-#define EXT4_MOUNT_ERRORS_CONT 0x00010 /* Continue on errors */
-#define EXT4_MOUNT_ERRORS_RO 0x00020 /* Remount fs ro on errors */
-#define EXT4_MOUNT_ERRORS_PANIC 0x00040 /* Panic on errors */
-#define EXT4_MOUNT_MINIX_DF 0x00080 /* Mimics the Minix statfs */
-#define EXT4_MOUNT_NOLOAD 0x00100 /* Don't use existing journal*/
-#define EXT4_MOUNT_DATA_FLAGS 0x00C00 /* Mode for data writes: */
-#define EXT4_MOUNT_JOURNAL_DATA 0x00400 /* Write data to journal */
-#define EXT4_MOUNT_ORDERED_DATA 0x00800 /* Flush data before commit */
-#define EXT4_MOUNT_WRITEBACK_DATA 0x00C00 /* No data ordering */
-#define EXT4_MOUNT_UPDATE_JOURNAL 0x01000 /* Update the journal format */
-#define EXT4_MOUNT_NO_UID32 0x02000 /* Disable 32-bit UIDs */
-#define EXT4_MOUNT_XATTR_USER 0x04000 /* Extended user attributes */
-#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
-#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
-#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
-#define EXT4_MOUNT_NOBH 0x40000 /* No bufferheads */
-#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
-#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
-#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
-#define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */
-#define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */
-#define EXT4_MOUNT_I_VERSION 0x2000000 /* i_version support */
-#define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */
-#define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */
-#define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000 /* Block validity checking */
-#define EXT4_MOUNT_DISCARD 0x40000000 /* Issue DISCARD requests */
+#define EXT4_MOUNT_OLDALLOC 0x00002LL /* Don't use the new Orlov allocator */
+#define EXT4_MOUNT_GRPID 0x00004LL /* Create files with directory's group */
+#define EXT4_MOUNT_DEBUG 0x00008LL /* Some debugging messages */
+#define EXT4_MOUNT_ERRORS_CONT 0x00010LL /* Continue on errors */
+#define EXT4_MOUNT_ERRORS_RO 0x00020LL /* Remount fs ro on errors */
+#define EXT4_MOUNT_ERRORS_PANIC 0x00040LL /* Panic on errors */
+#define EXT4_MOUNT_MINIX_DF 0x00080LL /* Mimics the Minix statfs */
+#define EXT4_MOUNT_NOLOAD 0x00100LL /* Don't use existing journal*/
+#define EXT4_MOUNT_DATA_FLAGS 0x00C00LL /* Mode for data writes: */
+#define EXT4_MOUNT_JOURNAL_DATA 0x00400LL /* Write data to journal */
+#define EXT4_MOUNT_ORDERED_DATA 0x00800LL /* Flush data before commit */
+#define EXT4_MOUNT_WRITEBACK_DATA 0x00C00LL /* No data ordering */
+#define EXT4_MOUNT_UPDATE_JOURNAL 0x01000LL /* Update the journal format */
+#define EXT4_MOUNT_NO_UID32 0x02000LL /* Disable 32-bit UIDs */
+#define EXT4_MOUNT_XATTR_USER 0x04000LL /* Extended user attributes */
+#define EXT4_MOUNT_POSIX_ACL 0x08000LL /* POSIX Access Control Lists */
+#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000LL /* No auto delalloc mapping */
+#define EXT4_MOUNT_BARRIER 0x20000LL /* Use block barriers */
+#define EXT4_MOUNT_NOBH 0x40000LL /* No bufferheads */
+#define EXT4_MOUNT_QUOTA 0x80000LL /* Some quota option set */
+#define EXT4_MOUNT_USRQUOTA 0x100000LL /* "old" user quota */
+#define EXT4_MOUNT_GRPQUOTA 0x200000LL /* "old" group quota */
+#define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000LL /* Journal checksums */
+#define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000LL /* Journal Async Commit */
+#define EXT4_MOUNT_I_VERSION 0x2000000LL /* i_version support */
+#define EXT4_MOUNT_DELALLOC 0x8000000LL /* Delalloc support */
+#define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000LL /* Abort on file data write */
+#define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000LL /* Block validity checking */
+#define EXT4_MOUNT_DISCARD 0x40000000LL /* Issue DISCARD requests */
#define clear_opt(o, opt) o &= ~EXT4_MOUNT_##opt
#define set_opt(o, opt) o |= EXT4_MOUNT_##opt
@@ -915,7 +915,7 @@ struct ext4_sb_info {
struct buffer_head * s_sbh; /* Buffer containing the super block */
struct ext4_super_block *s_es; /* Pointer to the super block in the buffer */
struct buffer_head **s_group_desc;
- unsigned int s_mount_opt;
+ unsigned long long s_mount_opt;
unsigned int s_mount_flags;
ext4_fsblk_t s_sb_block;
uid_t s_resuid;
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index b57e5c7..36e1f98 100644
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -58,7 +58,7 @@ int __ext4_forget(const char *where, handle_t *handle, int is_metadata,
BUFFER_TRACE(bh, "enter");
jbd_debug(4, "forgetting bh %p: is_metadata = %d, mode %o, "
- "data mode %x\n",
+ "data mode %llx\n",
bh, is_metadata, inode->i_mode,
test_opt(inode->i_sb, DATA_FLAGS));
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 84a51d9..80d6c14 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1700,7 +1700,7 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,
ext4_commit_super(sb, 1);
if (test_opt(sb, DEBUG))
printk(KERN_INFO "[EXT4 FS bs=%lu, gc=%u, "
- "bpg=%lu, ipg=%lu, mo=%04x]\n",
+ "bpg=%lu, ipg=%lu, mo=%08llx]\n",
sb->s_blocksize,
sbi->s_groups_count,
EXT4_BLOCKS_PER_GROUP(sb),
--
1.6.6
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
