-Index: linux-2.6.16.60-0.37/fs/ext3/super.c
+Index: linux-stage/fs/ext3/super.c
===================================================================
---- linux-2.6.16.60-0.37.orig/fs/ext3/super.c
-+++ linux-2.6.16.60-0.37/fs/ext3/super.c
+--- linux-stage.orig/fs/ext3/super.c
++++ linux-stage/fs/ext3/super.c
@@ -36,6 +36,8 @@
#include <linux/namei.h>
#include <linux/quotaops.h>
#include <asm/uaccess.h>
+@@ -84,7 +86,7 @@ handle_t *ext3_journal_start_sb(struct s
+ * take the FS itself readonly cleanly. */
+ journal = EXT3_SB(sb)->s_journal;
+ if (is_journal_aborted(journal)) {
+- ext3_abort(sb, __FUNCTION__,
++ ext3_abort(sb, __func__,
+ "Detected aborted journal");
+ return ERR_PTR(-EROFS);
+ }
+@@ -305,7 +307,7 @@ void ext3_update_dynamic_rev(struct supe
+ if (le32_to_cpu(es->s_rev_level) > EXT3_GOOD_OLD_REV)
+ return;
+
+- ext3_warning(sb, __FUNCTION__,
++ ext3_warning(sb, __func__,
+ "updating to rev %d because of new feature flag, "
+ "running e2fsck is recommended",
+ EXT3_DYNAMIC_REV);
@@ -436,6 +438,8 @@ static void ext3_put_super (struct super
invalidate_bdev(sbi->journal_bdev, 0);
ext3_blkdev_remove(sbi);
if (sbi->s_dev_proc) {
remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
sbi->s_dev_proc = NULL;
-@@ -1525,6 +1529,329 @@ static unsigned long descriptor_loc(stru
+@@ -1357,7 +1361,7 @@ static int ext3_check_descriptors (struc
+ return 0;
+ }
+ if (!ext3_group_desc_csum_verify(sbi, i, gdp)) {
+- ext3_error(sb, __FUNCTION__,
++ ext3_error(sb, __func__,
+ "Checksum for group %d failed (%u!=%u)\n", i,
+ le16_to_cpu(ext3_group_desc_csum(sbi,i,gdp)),
+ le16_to_cpu(gdp->bg_checksum));
+@@ -1446,7 +1450,7 @@ static void ext3_orphan_cleanup (struct
+ if (inode->i_nlink) {
+ printk(KERN_DEBUG
+ "%s: truncating inode %ld to %Ld bytes\n",
+- __FUNCTION__, inode->i_ino, inode->i_size);
++ __func__, inode->i_ino, inode->i_size);
+ jbd_debug(2, "truncating inode %ld to %Ld bytes\n",
+ inode->i_ino, inode->i_size);
+ ext3_truncate(inode);
+@@ -1454,7 +1458,7 @@ static void ext3_orphan_cleanup (struct
+ } else {
+ printk(KERN_DEBUG
+ "%s: deleting unreferenced inode %ld\n",
+- __FUNCTION__, inode->i_ino);
++ __func__, inode->i_ino);
+ jbd_debug(2, "deleting unreferenced inode %ld\n",
+ inode->i_ino);
+ nr_orphans++;
+@@ -1525,6 +1529,346 @@ static unsigned long descriptor_loc(stru
return (first_data_block + has_super + (bg * sbi->s_blocks_per_group));
}
+ }
+#endif
+ if (!*bh) {
-+ ext3_warning(sb, __FUNCTION__,
++ ext3_warning(sb, __func__,
+ "Error while reading MMP block %lu", mmp_block);
+ return -EIO;
+ }
+ * (s_mmp_update_interval * 60) seconds.
+ */
+ if (retval && (failed_writes % 60) == 0) {
-+ ext3_error(sb, __FUNCTION__,
++ ext3_error(sb, __func__,
+ "Error writing to MMP block");
+ failed_writes++;
+ }
+
+ if (!(le32_to_cpu(es->s_feature_incompat) &
+ EXT3_FEATURE_INCOMPAT_MMP)) {
-+ ext3_warning(sb, __FUNCTION__, "kmmpd being stopped "
++ ext3_warning(sb, __func__, "kmmpd being stopped "
+ "since MMP feature has been disabled.");
+ EXT3_SB(sb)->s_mmp_tsk = 0;
+ goto failed;
+ }
+
+ if (sb->s_flags & MS_RDONLY) {
-+ ext3_warning(sb, __FUNCTION__, "kmmpd being stopped "
++ ext3_warning(sb, __func__, "kmmpd being stopped "
+ "since filesystem has been remounted as "
+ "readonly.");
+ EXT3_SB(sb)->s_mmp_tsk = 0;
+ if (mmp->mmp_time != mmp_check->mmp_time ||
+ memcmp(mmp->mmp_nodename, mmp_check->mmp_nodename,
+ sizeof(mmp->mmp_nodename)))
-+ dump_mmp_msg(sb, mmp_check, __FUNCTION__,
++ dump_mmp_msg(sb, mmp_check, __func__,
+ "Error while updating MMP info. "
+ "The filesystem seems to have "
+ "been multiply mounted.");
+ struct mmp_struct *mmp = NULL;
+ u32 seq;
+ unsigned int mmp_check_interval = le16_to_cpu(es->s_mmp_update_interval);
++ unsigned int wait_time = 0;
+ int retval;
+
+ if (mmp_block < le32_to_cpu(es->s_first_data_block) ||
+ mmp_block >= le32_to_cpu(es->s_blocks_count)) {
-+ ext3_warning(sb, __FUNCTION__,
++ ext3_warning(sb, __func__,
+ "Invalid MMP block in superblock");
+ goto failed;
+ }
+ goto skip;
+
+ if (seq == EXT3_MMP_SEQ_FSCK) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "fsck is running on the filesystem");
+ goto failed;
+ }
+
-+ schedule_timeout_uninterruptible(HZ * (2 * mmp_check_interval + 1));
++ wait_time = min(mmp_check_interval * 2 + 1,
++ mmp_check_interval + 60);
++
++ /* Print MMP interval if more than 20 secs. */
++ if (wait_time > EXT3_MMP_MIN_CHECK_INTERVAL * 4)
++ ext3_warning(sb, __func__, "MMP interval %u higher than "
++ "expected, please wait.\n", wait_time * 2);
++
++ if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
++ ext3_warning(sb, __func__, "MMP startup interrupted, failing "
++ "mount\n");
++ goto failed;
++ }
+
+ retval = read_mmp_block(sb, &bh, mmp_block);
+ if (retval)
+ goto failed;
+ mmp = (struct mmp_struct *)(bh->b_data);
+ if (seq != le32_to_cpu(mmp->mmp_seq)) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "Device is already active on another node.");
+ goto failed;
+ }
+ /*
+ * wait for MMP interval and check mmp_seq.
+ */
-+ schedule_timeout_uninterruptible(HZ * (2 * mmp_check_interval + 1));
++ if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
++ ext3_warning(sb, __func__, "MMP startup interrupted, failing "
++ "mount\n");
++ goto failed;
++ }
+
+ retval = read_mmp_block(sb, &bh, mmp_block);
+ if (retval)
+ goto failed;
+ mmp = (struct mmp_struct *)(bh->b_data);
+ if (seq != le32_to_cpu(mmp->mmp_seq)) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "Device is already active on another node.");
+ goto failed;
+ }
+ MINOR(sb->s_dev));
+ if (IS_ERR(EXT3_SB(sb)->s_mmp_tsk)) {
+ EXT3_SB(sb)->s_mmp_tsk = 0;
-+ ext3_warning(sb, __FUNCTION__, "Unable to create kmmpd thread "
++ ext3_warning(sb, __func__, "Unable to create kmmpd thread "
+ "for %s.", sb->s_id);
+ goto failed;
+ }
static int ext3_fill_super (struct super_block *sb, void *data, int silent)
{
-@@ -1849,6 +2176,11 @@ static int ext3_fill_super (struct super
+@@ -1848,6 +2192,11 @@ static int ext3_fill_super (struct super
EXT3_HAS_INCOMPAT_FEATURE(sb,
EXT3_FEATURE_INCOMPAT_RECOVER));
/*
* The first inode we look at is the journal inode. Don't try
* root first: it may be modified in the journal!
-@@ -1993,6 +2325,8 @@ cantfind_ext3:
+@@ -1992,6 +2341,8 @@ cantfind_ext3:
failed_mount3:
journal_destroy(sbi->s_journal);
failed_mount2:
for (i = 0; i < db_count; i++)
brelse(sbi->s_group_desc[i]);
kfree(sbi->s_group_desc);
-@@ -2463,7 +2797,7 @@ static int ext3_remount (struct super_bl
+@@ -2357,9 +2708,9 @@ static void ext3_clear_journal_err(struc
+ char nbuf[16];
+
+ errstr = ext3_decode_error(sb, j_errno, nbuf);
+- ext3_warning(sb, __FUNCTION__, "Filesystem error recorded "
++ ext3_warning(sb, __func__, "Filesystem error recorded "
+ "from previous mount: %s", errstr);
+- ext3_warning(sb, __FUNCTION__, "Marking fs in need of "
++ ext3_warning(sb, __func__, "Marking fs in need of "
+ "filesystem check.");
+
+ EXT3_SB(sb)->s_mount_state |= EXT3_ERROR_FS;
+@@ -2462,7 +2813,7 @@ static int ext3_remount (struct super_bl
unsigned long n_blocks_count = 0;
unsigned long old_sb_flags;
struct ext3_mount_options old_opts;
#ifdef CONFIG_QUOTA
int i;
#endif
-@@ -2547,6 +2881,13 @@ static int ext3_remount (struct super_bl
+@@ -2488,7 +2839,7 @@ static int ext3_remount (struct super_bl
+ }
+
+ if (sbi->s_mount_opt & EXT3_MOUNT_ABORT)
+- ext3_abort(sb, __FUNCTION__, "Abort forced by user");
++ ext3_abort(sb, __func__, "Abort forced by user");
+
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ ((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+@@ -2546,6 +2897,13 @@ static int ext3_remount (struct super_bl
}
if (!ext3_setup_super (sb, es, 0))
sb->s_flags &= ~MS_RDONLY;
}
}
#ifdef CONFIG_QUOTA
-Index: linux-2.6.16.60-0.37/include/linux/ext3_fs.h
+Index: linux-stage/include/linux/ext3_fs.h
===================================================================
---- linux-2.6.16.60-0.37.orig/include/linux/ext3_fs.h
-+++ linux-2.6.16.60-0.37/include/linux/ext3_fs.h
+--- linux-stage.orig/include/linux/ext3_fs.h
++++ linux-stage/include/linux/ext3_fs.h
@@ -597,13 +597,17 @@ struct ext3_super_block {
__le32 s_first_meta_bg; /* First metablock block group */
__le32 s_mkfs_time; /* When the filesystem was created */
* Function prototypes
*/
-Index: linux-2.6.16.60-0.37/include/linux/ext3_fs_sb.h
+Index: linux-stage/include/linux/ext3_fs_sb.h
===================================================================
---- linux-2.6.16.60-0.37.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.16.60-0.37/include/linux/ext3_fs_sb.h
-@@ -147,6 +147,7 @@ struct ext3_sb_info {
+--- linux-stage.orig/include/linux/ext3_fs_sb.h
++++ linux-stage/include/linux/ext3_fs_sb.h
+@@ -145,6 +145,7 @@ struct ext3_sb_info {
/* locality groups */
struct ext3_locality_group *s_locality_groups;
-Index: linux-2.6.18-128.1.6/fs/ext3/super.c
+Index: linux-stage/fs/ext3/super.c
===================================================================
---- linux-2.6.18-128.1.6.orig/fs/ext3/super.c
-+++ linux-2.6.18-128.1.6/fs/ext3/super.c
+--- linux-stage.orig/fs/ext3/super.c
++++ linux-stage/fs/ext3/super.c
@@ -35,6 +35,8 @@
#include <linux/namei.h>
#include <linux/quotaops.h>
#include <asm/uaccess.h>
+@@ -83,7 +85,7 @@ handle_t *ext3_journal_start_sb(struct s
+ * take the FS itself readonly cleanly. */
+ journal = EXT3_SB(sb)->s_journal;
+ if (is_journal_aborted(journal)) {
+- ext3_abort(sb, __FUNCTION__,
++ ext3_abort(sb, __func__,
+ "Detected aborted journal");
+ return ERR_PTR(-EROFS);
+ }
+@@ -305,7 +307,7 @@ void ext3_update_dynamic_rev(struct supe
+ if (le32_to_cpu(es->s_rev_level) > EXT3_GOOD_OLD_REV)
+ return;
+
+- ext3_warning(sb, __FUNCTION__,
++ ext3_warning(sb, __func__,
+ "updating to rev %d because of new feature flag, "
+ "running e2fsck is recommended",
+ EXT3_DYNAMIC_REV);
@@ -440,6 +442,8 @@ static void ext3_put_super (struct super
invalidate_bdev(sbi->journal_bdev, 0);
ext3_blkdev_remove(sbi);
if (sbi->s_dev_proc) {
remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
sbi->s_dev_proc = NULL;
-@@ -1548,6 +1552,329 @@ static ext3_fsblk_t descriptor_loc(struc
+@@ -1375,7 +1379,7 @@ static int ext3_check_descriptors (struc
+ return 0;
+ }
+ if (!ext3_group_desc_csum_verify(sbi, i, gdp)) {
+- ext3_error(sb, __FUNCTION__,
++ ext3_error(sb, __func__,
+ "Checksum for group %d failed (%u!=%u)\n", i,
+ le16_to_cpu(ext3_group_desc_csum(sbi,i,gdp)),
+ le16_to_cpu(gdp->bg_checksum));
+@@ -1470,7 +1474,7 @@ static void ext3_orphan_cleanup (struct
+ if (inode->i_nlink) {
+ printk(KERN_DEBUG
+ "%s: truncating inode %lu to %Ld bytes\n",
+- __FUNCTION__, inode->i_ino, inode->i_size);
++ __func__, inode->i_ino, inode->i_size);
+ jbd_debug(2, "truncating inode %lu to %Ld bytes\n",
+ inode->i_ino, inode->i_size);
+ ext3_truncate(inode);
+@@ -1478,7 +1482,7 @@ static void ext3_orphan_cleanup (struct
+ } else {
+ printk(KERN_DEBUG
+ "%s: deleting unreferenced inode %lu\n",
+- __FUNCTION__, inode->i_ino);
++ __func__, inode->i_ino);
+ jbd_debug(2, "deleting unreferenced inode %lu\n",
+ inode->i_ino);
+ nr_orphans++;
+@@ -1548,6 +1552,346 @@ static ext3_fsblk_t descriptor_loc(struc
return (has_super + ext3_group_first_block_no(sb, bg));
}
+ }
+#endif
+ if (!*bh) {
-+ ext3_warning(sb, __FUNCTION__,
++ ext3_warning(sb, __func__,
+ "Error while reading MMP block %lu", mmp_block);
+ return -EIO;
+ }
+ * (s_mmp_update_interval * 60) seconds.
+ */
+ if (retval && (failed_writes % 60) == 0) {
-+ ext3_error(sb, __FUNCTION__,
++ ext3_error(sb, __func__,
+ "Error writing to MMP block");
+ failed_writes++;
+ }
+
+ if (!(le32_to_cpu(es->s_feature_incompat) &
+ EXT3_FEATURE_INCOMPAT_MMP)) {
-+ ext3_warning(sb, __FUNCTION__, "kmmpd being stopped "
++ ext3_warning(sb, __func__, "kmmpd being stopped "
+ "since MMP feature has been disabled.");
+ EXT3_SB(sb)->s_mmp_tsk = 0;
+ goto failed;
+ }
+
+ if (sb->s_flags & MS_RDONLY) {
-+ ext3_warning(sb, __FUNCTION__, "kmmpd being stopped "
++ ext3_warning(sb, __func__, "kmmpd being stopped "
+ "since filesystem has been remounted as "
+ "readonly.");
+ EXT3_SB(sb)->s_mmp_tsk = 0;
+ if (mmp->mmp_time != mmp_check->mmp_time ||
+ memcmp(mmp->mmp_nodename, mmp_check->mmp_nodename,
+ sizeof(mmp->mmp_nodename)))
-+ dump_mmp_msg(sb, mmp_check, __FUNCTION__,
++ dump_mmp_msg(sb, mmp_check, __func__,
+ "Error while updating MMP info. "
+ "The filesystem seems to have "
+ "been multiply mounted.");
+ struct mmp_struct *mmp = NULL;
+ u32 seq;
+ unsigned int mmp_check_interval = le16_to_cpu(es->s_mmp_update_interval);
++ unsigned int wait_time = 0;
+ int retval;
+
+ if (mmp_block < le32_to_cpu(es->s_first_data_block) ||
+ mmp_block >= le32_to_cpu(es->s_blocks_count)) {
-+ ext3_warning(sb, __FUNCTION__,
++ ext3_warning(sb, __func__,
+ "Invalid MMP block in superblock");
+ goto failed;
+ }
+ goto skip;
+
+ if (seq == EXT3_MMP_SEQ_FSCK) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "fsck is running on the filesystem");
+ goto failed;
+ }
+
-+ schedule_timeout_uninterruptible(HZ * (2 * mmp_check_interval + 1));
++ wait_time = min(mmp_check_interval * 2 + 1,
++ mmp_check_interval + 60);
++
++ /* Print MMP interval if more than 20 secs. */
++ if (wait_time > EXT3_MMP_MIN_CHECK_INTERVAL * 4)
++ ext3_warning(sb, __func__, "MMP interval %u higher than "
++ "expected, please wait.\n", wait_time * 2);
++
++ if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
++ ext3_warning(sb, __func__, "MMP startup interrupted, failing "
++ "mount\n");
++ goto failed;
++ }
+
+ retval = read_mmp_block(sb, &bh, mmp_block);
+ if (retval)
+ goto failed;
+ mmp = (struct mmp_struct *)(bh->b_data);
+ if (seq != le32_to_cpu(mmp->mmp_seq)) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "Device is already active on another node.");
+ goto failed;
+ }
+ /*
+ * wait for MMP interval and check mmp_seq.
+ */
-+ schedule_timeout_uninterruptible(HZ * (2 * mmp_check_interval + 1));
++ if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
++ ext3_warning(sb, __func__, "MMP startup interrupted, failing "
++ "mount\n");
++ goto failed;
++ }
+
+ retval = read_mmp_block(sb, &bh, mmp_block);
+ if (retval)
+ goto failed;
+ mmp = (struct mmp_struct *)(bh->b_data);
+ if (seq != le32_to_cpu(mmp->mmp_seq)) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "Device is already active on another node.");
+ goto failed;
+ }
+ MINOR(sb->s_dev));
+ if (IS_ERR(EXT3_SB(sb)->s_mmp_tsk)) {
+ EXT3_SB(sb)->s_mmp_tsk = 0;
-+ ext3_warning(sb, __FUNCTION__, "Unable to create kmmpd thread "
++ ext3_warning(sb, __func__, "Unable to create kmmpd thread "
+ "for %s.", sb->s_id);
+ goto failed;
+ }
static int ext3_fill_super (struct super_block *sb, void *data, int silent)
{
-@@ -1880,6 +2207,11 @@ static int ext3_fill_super (struct super
+@@ -1880,6 +2224,11 @@ static int ext3_fill_super (struct super
EXT3_HAS_INCOMPAT_FEATURE(sb,
EXT3_FEATURE_INCOMPAT_RECOVER));
/*
* The first inode we look at is the journal inode. Don't try
* root first: it may be modified in the journal!
-@@ -2012,6 +2344,8 @@ cantfind_ext3:
+@@ -2012,6 +2361,8 @@ cantfind_ext3:
failed_mount4:
journal_destroy(sbi->s_journal);
failed_mount3:
percpu_counter_destroy(&sbi->s_freeblocks_counter);
percpu_counter_destroy(&sbi->s_freeinodes_counter);
percpu_counter_destroy(&sbi->s_dirs_counter);
-@@ -2497,7 +2831,7 @@ static int ext3_remount (struct super_bl
+@@ -2388,9 +2739,9 @@ static void ext3_clear_journal_err(struc
+ char nbuf[16];
+
+ errstr = ext3_decode_error(sb, j_errno, nbuf);
+- ext3_warning(sb, __FUNCTION__, "Filesystem error recorded "
++ ext3_warning(sb, __func__, "Filesystem error recorded "
+ "from previous mount: %s", errstr);
+- ext3_warning(sb, __FUNCTION__, "Marking fs in need of "
++ ext3_warning(sb, __func__, "Marking fs in need of "
+ "filesystem check.");
+
+ EXT3_SB(sb)->s_mount_state |= EXT3_ERROR_FS;
+@@ -2510,7 +2861,7 @@ static int ext3_remount (struct super_bl
ext3_fsblk_t n_blocks_count = 0;
unsigned long old_sb_flags;
struct ext3_mount_options old_opts;
#ifdef CONFIG_QUOTA
int i;
#endif
-@@ -2595,6 +2929,13 @@ static int ext3_remount (struct super_bl
+@@ -2536,7 +2887,7 @@ static int ext3_remount (struct super_bl
+ }
+
+ if (sbi->s_mount_opt & EXT3_MOUNT_ABORT)
+- ext3_abort(sb, __FUNCTION__, "Abort forced by user");
++ ext3_abort(sb, __func__, "Abort forced by user");
+
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ ((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+@@ -2609,6 +2960,13 @@ static int ext3_remount (struct super_bl
}
if (!ext3_setup_super (sb, es, 0))
sb->s_flags &= ~MS_RDONLY;
}
}
#ifdef CONFIG_QUOTA
-Index: linux-2.6.18-128.1.6/include/linux/ext3_fs.h
+Index: linux-stage/include/linux/ext3_fs.h
===================================================================
---- linux-2.6.18-128.1.6.orig/include/linux/ext3_fs.h
-+++ linux-2.6.18-128.1.6/include/linux/ext3_fs.h
+--- linux-stage.orig/include/linux/ext3_fs.h
++++ linux-stage/include/linux/ext3_fs.h
@@ -594,13 +594,17 @@ struct ext3_super_block {
__le32 s_first_meta_bg; /* First metablock block group */
__le32 s_mkfs_time; /* When the filesystem was created */
* Function prototypes
*/
-Index: linux-2.6.18-128.1.6/include/linux/ext3_fs_sb.h
+Index: linux-stage/include/linux/ext3_fs_sb.h
===================================================================
---- linux-2.6.18-128.1.6.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.18-128.1.6/include/linux/ext3_fs_sb.h
-@@ -158,6 +158,7 @@ struct ext3_sb_info {
+--- linux-stage.orig/include/linux/ext3_fs_sb.h
++++ linux-stage/include/linux/ext3_fs_sb.h
+@@ -156,6 +156,7 @@ struct ext3_sb_info {
/* locality groups */
struct ext3_locality_group *s_locality_groups;
-Index: linux-2.6.18-128.1.6/fs/ext4/super.c
+Index: linux-stage/fs/ext4/super.c
===================================================================
---- linux-2.6.18-128.1.6.orig/fs/ext4/super.c
-+++ linux-2.6.18-128.1.6/fs/ext4/super.c
-@@ -36,6 +36,8 @@
+--- linux-stage.orig/fs/ext4/super.c
++++ linux-stage/fs/ext4/super.c
+@@ -38,6 +38,8 @@
#include <linux/log2.h>
#include <linux/crc16.h>
#include <asm/uaccess.h>
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -547,6 +549,8 @@ static void ext4_put_super(struct super_
+@@ -617,6 +619,8 @@ static void ext4_put_super(struct super_
invalidate_bdev(sbi->journal_bdev, 0);
ext4_blkdev_remove(sbi);
}
sb->s_fs_info = NULL;
kfree(sbi);
return;
-@@ -766,6 +770,328 @@ static int ext4_show_options(struct seq_
+@@ -864,6 +868,345 @@ static int ext4_show_options(struct seq_
return 0;
}
+ }
+#endif
+ if (!*bh) {
-+ ext4_warning(sb, __FUNCTION__,
++ ext4_warning(sb, __func__,
+ "Error while reading MMP block %lu", mmp_block);
+ return -EIO;
+ }
+ * (s_mmp_update_interval * 60) seconds.
+ */
+ if (retval && (failed_writes % 60) == 0) {
-+ ext4_error(sb, __FUNCTION__,
++ ext4_error(sb, __func__,
+ "Error writing to MMP block");
+ failed_writes++;
+ }
+
+ if (!(le32_to_cpu(es->s_feature_incompat) &
+ EXT4_FEATURE_INCOMPAT_MMP)) {
-+ ext4_warning(sb, __FUNCTION__, "kmmpd being stopped "
++ ext4_warning(sb, __func__, "kmmpd being stopped "
+ "since MMP feature has been disabled.");
+ EXT4_SB(sb)->s_mmp_tsk = 0;
+ goto failed;
+ }
+
+ if (sb->s_flags & MS_RDONLY) {
-+ ext4_warning(sb, __FUNCTION__, "kmmpd being stopped "
++ ext4_warning(sb, __func__, "kmmpd being stopped "
+ "since filesystem has been remounted as "
+ "readonly.");
+ EXT4_SB(sb)->s_mmp_tsk = 0;
+ if (mmp->mmp_time != mmp_check->mmp_time ||
+ memcmp(mmp->mmp_nodename, mmp_check->mmp_nodename,
+ sizeof(mmp->mmp_nodename)))
-+ dump_mmp_msg(sb, mmp_check, __FUNCTION__,
++ dump_mmp_msg(sb, mmp_check, __func__,
+ "Error while updating MMP info. "
+ "The filesystem seems to have "
+ "been multiply mounted.");
+ struct mmp_struct *mmp = NULL;
+ u32 seq;
+ unsigned int mmp_check_interval = le16_to_cpu(es->s_mmp_update_interval);
++ unsigned int wait_time = 0;
+ int retval;
+
+ if (mmp_block < le32_to_cpu(es->s_first_data_block) ||
+ mmp_block >= ext4_blocks_count(es)) {
-+ ext4_warning(sb, __FUNCTION__,
++ ext4_warning(sb, __func__,
+ "Invalid MMP block in superblock");
+ goto failed;
+ }
+ goto skip;
+
+ if (seq == EXT4_MMP_SEQ_FSCK) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "fsck is running on the filesystem");
+ goto failed;
+ }
+
-+ schedule_timeout_uninterruptible(HZ * (2 * mmp_check_interval + 1));
++ wait_time = min(mmp_check_interval * 2 + 1,
++ mmp_check_interval + 60);
++
++ /* Print MMP interval if more than 20 secs. */
++ if (wait_time > EXT4_MMP_MIN_CHECK_INTERVAL * 4)
++ ext4_warning(sb, __func__, "MMP interval %u higher than "
++ "expected, please wait.\n", wait_time * 2);
++
++ if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
++ ext4_warning(sb, __func__, "MMP startup interrupted, failing "
++ "mount\n");
++ goto failed;
++ }
+
+ retval = read_mmp_block(sb, &bh, mmp_block);
+ if (retval)
+ goto failed;
+ mmp = (struct mmp_struct *)(bh->b_data);
+ if (seq != le32_to_cpu(mmp->mmp_seq)) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "Device is already active on another node.");
+ goto failed;
+ }
+ /*
+ * wait for MMP interval and check mmp_seq.
+ */
-+ schedule_timeout_uninterruptible(HZ * (2 * mmp_check_interval + 1));
++ if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
++ ext4_warning(sb, __func__, "MMP startup interrupted, failing "
++ "mount\n");
++ goto failed;
++ }
+
+ retval = read_mmp_block(sb, &bh, mmp_block);
+ if (retval)
+ goto failed;
+ mmp = (struct mmp_struct *)(bh->b_data);
+ if (seq != le32_to_cpu(mmp->mmp_seq)) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "Device is already active on another node.");
+ goto failed;
+ }
+ MINOR(sb->s_dev));
+ if (IS_ERR(EXT4_SB(sb)->s_mmp_tsk)) {
+ EXT4_SB(sb)->s_mmp_tsk = 0;
-+ ext4_warning(sb, __FUNCTION__, "Unable to create kmmpd thread "
++ ext4_warning(sb, __func__, "Unable to create kmmpd thread "
+ "for %s.", sb->s_id);
+ goto failed;
+ }
static struct dentry *ext4_get_dentry(struct super_block *sb, void *vobjp)
{
-@@ -775,7 +1101,6 @@ static struct dentry *ext4_get_dentry(st
+@@ -873,7 +1216,6 @@ static struct dentry *ext4_get_dentry(st
struct inode *inode;
struct dentry *result;
if (ino < EXT4_FIRST_INO(sb) && ino != EXT4_ROOT_INO)
return ERR_PTR(-ESTALE);
if (ino > le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count))
-@@ -2258,6 +2583,11 @@ static int ext4_fill_super(struct super_
+@@ -2407,6 +2749,11 @@ static int ext4_fill_super(struct super_
EXT4_HAS_INCOMPAT_FEATURE(sb,
EXT4_FEATURE_INCOMPAT_RECOVER));
/*
* The first inode we look at is the journal inode. Don't try
* root first: it may be modified in the journal!
-@@ -2445,6 +2775,8 @@ failed_mount3:
+@@ -2621,6 +2968,8 @@ failed_mount3:
percpu_counter_destroy(&sbi->s_freeinodes_counter);
percpu_counter_destroy(&sbi->s_dirs_counter);
- percpu_counter_destroy(&sbi->s_dirtyblocks_counter);
+ percpu_counter_destroy(&sbi->s_dirtyblocks_counter);
+ if (sbi->s_mmp_tsk)
+ kthread_stop(sbi->s_mmp_tsk);
failed_mount2:
for (i = 0; i < db_count; i++)
brelse(sbi->s_group_desc[i]);
-@@ -2918,7 +3250,7 @@ static int ext4_remount(struct super_blo
+@@ -3142,7 +3491,7 @@ static int ext4_remount(struct super_blo
struct ext4_mount_options old_opts;
ext4_group_t g;
- unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO;
+ unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO;
- int err;
+ int err = 0;
#ifdef CONFIG_QUOTA
int i;
#endif
-@@ -3042,6 +3374,13 @@ static int ext4_remount(struct super_blo
+@@ -3278,6 +3627,13 @@ static int ext4_remount(struct super_blo
goto restore_opts;
if (!ext4_setup_super(sb, es, 0))
sb->s_flags &= ~MS_RDONLY;
+ }
}
}
- #ifdef CONFIG_QUOTA
-Index: linux-2.6.18-128.1.6/fs/ext4/ext4.h
+ if (sbi->s_journal == NULL)
+Index: linux-stage/fs/ext4/ext4.h
===================================================================
---- linux-2.6.18-128.1.6.orig/fs/ext4/ext4.h
-+++ linux-2.6.18-128.1.6/fs/ext4/ext4.h
-@@ -658,7 +658,7 @@ struct ext4_super_block {
+--- linux-stage.orig/fs/ext4/ext4.h
++++ linux-stage/fs/ext4/ext4.h
+@@ -665,7 +665,7 @@ struct ext4_super_block {
__le16 s_want_extra_isize; /* New inodes should reserve # bytes */
__le32 s_flags; /* Miscellaneous flags */
__le16 s_raid_stride; /* RAID stride */
__le64 s_mmp_block; /* Block for multi-mount protection */
__le32 s_raid_stripe_width; /* blocks on all data disks (N*stride)*/
__u8 s_log_groups_per_flex; /* FLEX_BG group size */
-@@ -775,7 +775,8 @@ static inline int ext4_valid_inum(struct
+@@ -782,7 +782,8 @@ static inline int ext4_valid_inum(struct
EXT4_FEATURE_INCOMPAT_META_BG| \
EXT4_FEATURE_INCOMPAT_EXTENTS| \
EXT4_FEATURE_INCOMPAT_64BIT| \
#define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
-@@ -956,6 +957,39 @@ void ext4_get_group_no_and_offset(struct
- unsigned long *blockgrpp, ext4_grpblk_t *offsetp);
+@@ -995,6 +996,39 @@ do { \
+ #endif
/*
+ * This structure will be used for multiple mount protection. It will be
* Function prototypes
*/
-Index: linux-2.6.18-128.1.6/fs/ext4/ext4_sb.h
+Index: linux-stage/fs/ext4/ext4_sb.h
===================================================================
---- linux-2.6.18-128.1.6.orig/fs/ext4/ext4_sb.h
-+++ linux-2.6.18-128.1.6/fs/ext4/ext4_sb.h
-@@ -148,6 +148,8 @@ struct ext4_sb_info {
+--- linux-stage.orig/fs/ext4/ext4_sb.h
++++ linux-stage/fs/ext4/ext4_sb.h
+@@ -149,6 +149,8 @@ struct ext4_sb_info {
unsigned int s_log_groups_per_flex;
struct flex_groups *s_flex_groups;
-Index: linux-2.6.27.21-0.1/fs/ext4/super.c
+Index: linux-stage/fs/ext4/super.c
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/super.c 2009-07-07 14:36:58.000000000 +0530
-+++ linux-2.6.27.21-0.1/fs/ext4/super.c 2009-07-07 14:38:06.000000000 +0530
+--- linux-stage.orig/fs/ext4/super.c
++++ linux-stage/fs/ext4/super.c
@@ -39,6 +39,8 @@
#include <linux/log2.h>
#include <linux/crc16.h>
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -599,6 +601,8 @@
+@@ -600,6 +602,8 @@ static void ext4_put_super(struct super_
invalidate_bdev(sbi->journal_bdev);
ext4_blkdev_remove(sbi);
}
sb->s_fs_info = NULL;
kfree(sbi);
return;
-@@ -807,7 +811,6 @@
+@@ -808,7 +812,6 @@ static int ext4_show_options(struct seq_
if (!test_opt(sb, DELALLOC))
seq_puts(seq, ",nodelalloc");
if (sbi->s_stripe)
seq_printf(seq, ",stripe=%lu", sbi->s_stripe);
/*
-@@ -830,6 +833,325 @@
+@@ -831,6 +834,340 @@ static int ext4_show_options(struct seq_
}
+ }
+ }
+ if (!*bh) {
-+ ext4_warning(sb, __FUNCTION__,
++ ext4_warning(sb, __func__,
+ "Error while reading MMP block %lu", mmp_block);
+ return -EIO;
+ }
+ * (s_mmp_update_interval * 60) seconds.
+ */
+ if (retval && (failed_writes % 60) == 0) {
-+ ext4_error(sb, __FUNCTION__,
++ ext4_error(sb, __func__,
+ "Error writing to MMP block");
+ failed_writes++;
+ }
+
+ if (!(le32_to_cpu(es->s_feature_incompat) &
+ EXT4_FEATURE_INCOMPAT_MMP)) {
-+ ext4_warning(sb, __FUNCTION__, "kmmpd being stopped "
++ ext4_warning(sb, __func__, "kmmpd being stopped "
+ "since MMP feature has been disabled.");
+ EXT4_SB(sb)->s_mmp_tsk = 0;
+ goto failed;
+ }
+
+ if (sb->s_flags & MS_RDONLY) {
-+ ext4_warning(sb, __FUNCTION__, "kmmpd being stopped "
++ ext4_warning(sb, __func__, "kmmpd being stopped "
+ "since filesystem has been remounted as "
+ "readonly.");
+ EXT4_SB(sb)->s_mmp_tsk = 0;
+ if (mmp->mmp_time != mmp_check->mmp_time ||
+ memcmp(mmp->mmp_nodename, mmp_check->mmp_nodename,
+ sizeof(mmp->mmp_nodename)))
-+ dump_mmp_msg(sb, mmp_check, __FUNCTION__,
++ dump_mmp_msg(sb, mmp_check, __func__,
+ "Error while updating MMP info. "
+ "The filesystem seems to have "
+ "been multiply mounted.");
+ struct mmp_struct *mmp = NULL;
+ u32 seq;
+ unsigned int mmp_check_interval = le16_to_cpu(es->s_mmp_update_interval);
++ unsigned int wait_time = 0;
+ int retval;
+
+ if (mmp_block < le32_to_cpu(es->s_first_data_block) ||
+ mmp_block >= ext4_blocks_count(es)) {
-+ ext4_warning(sb, __FUNCTION__,
++ ext4_warning(sb, __func__,
+ "Invalid MMP block in superblock");
+ goto failed;
+ }
+ goto skip;
+
+ if (seq == EXT4_MMP_SEQ_FSCK) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "fsck is running on the filesystem");
+ goto failed;
+ }
+
-+ schedule_timeout_uninterruptible(HZ * (2 * mmp_check_interval + 1));
++ wait_time = min(mmp_check_interval * 2 + 1,
++ mmp_check_interval + 60);
++
++ /* Print MMP interval if more than 20 secs. */
++ if (wait_time > EXT4_MMP_MIN_CHECK_INTERVAL * 4)
++ ext4_warning(sb, __func__, "MMP interval %u higher than "
++ "expected, please wait.\n", wait_time * 2);
++
++ if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
++ ext4_warning(sb, __func__, "MMP startup interrupted, failing mount\n");
++ goto failed;
++ }
+
+ retval = read_mmp_block(sb, &bh, mmp_block);
+ if (retval)
+ goto failed;
+ mmp = (struct mmp_struct *)(bh->b_data);
+ if (seq != le32_to_cpu(mmp->mmp_seq)) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "Device is already active on another node.");
+ goto failed;
+ }
+ /*
+ * wait for MMP interval and check mmp_seq.
+ */
-+ schedule_timeout_uninterruptible(HZ * (2 * mmp_check_interval + 1));
++ if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
++ ext4_warning(sb, __func__, "MMP startup interrupted, failing mount\n");
++ goto failed;
++ }
+
+ retval = read_mmp_block(sb, &bh, mmp_block);
+ if (retval)
+ goto failed;
+ mmp = (struct mmp_struct *)(bh->b_data);
+ if (seq != le32_to_cpu(mmp->mmp_seq)) {
-+ dump_mmp_msg(sb, mmp, __FUNCTION__,
++ dump_mmp_msg(sb, mmp, __func__,
+ "Device is already active on another node.");
+ goto failed;
+ }
+ MINOR(sb->s_dev));
+ if (IS_ERR(EXT4_SB(sb)->s_mmp_tsk)) {
+ EXT4_SB(sb)->s_mmp_tsk = 0;
-+ ext4_warning(sb, __FUNCTION__, "Unable to create kmmpd thread "
++ ext4_warning(sb, __func__, "Unable to create kmmpd thread "
+ "for %s.", sb->s_id);
+ goto failed;
+ }
static struct inode *ext4_nfs_get_inode(struct super_block *sb,
u64 ino, u32 generation)
{
-@@ -2370,6 +2692,11 @@
+@@ -2371,6 +2708,11 @@ static int ext4_fill_super(struct super_
EXT4_HAS_INCOMPAT_FEATURE(sb,
EXT4_FEATURE_INCOMPAT_RECOVER));
/*
* The first inode we look at is the journal inode. Don't try
* root first: it may be modified in the journal!
-@@ -2570,6 +2897,8 @@
+@@ -2571,6 +2913,8 @@ failed_mount3:
percpu_counter_destroy(&sbi->s_freeinodes_counter);
percpu_counter_destroy(&sbi->s_dirs_counter);
percpu_counter_destroy(&sbi->s_dirtyblocks_counter);
failed_mount2:
for (i = 0; i < db_count; i++)
brelse(sbi->s_group_desc[i]);
-@@ -3085,7 +3414,7 @@
+@@ -3086,7 +3430,7 @@ static int ext4_remount(struct super_blo
unsigned long old_sb_flags;
struct ext4_mount_options old_opts;
ext4_group_t g;
#ifdef CONFIG_QUOTA
int i;
#endif
-@@ -3210,6 +3539,13 @@
+@@ -3211,6 +3555,13 @@ static int ext4_remount(struct super_blo
goto restore_opts;
if (!ext4_setup_super(sb, es, 0))
sb->s_flags &= ~MS_RDONLY;
}
}
#ifdef CONFIG_QUOTA
-Index: linux-2.6.27.21-0.1/fs/ext4/ext4.h
+Index: linux-stage/fs/ext4/ext4.h
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4.h 2009-07-07 14:36:00.000000000 +0530
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4.h 2009-07-07 14:36:58.000000000 +0530
-@@ -660,7 +660,7 @@
+--- linux-stage.orig/fs/ext4/ext4.h
++++ linux-stage/fs/ext4/ext4.h
+@@ -660,7 +660,7 @@ struct ext4_super_block {
__le16 s_want_extra_isize; /* New inodes should reserve # bytes */
__le32 s_flags; /* Miscellaneous flags */
__le16 s_raid_stride; /* RAID stride */
__le64 s_mmp_block; /* Block for multi-mount protection */
__le32 s_raid_stripe_width; /* blocks on all data disks (N*stride)*/
__u8 s_log_groups_per_flex; /* FLEX_BG group size */
-@@ -777,7 +777,8 @@
+@@ -777,7 +777,8 @@ static inline int ext4_valid_inum(struct
EXT4_FEATURE_INCOMPAT_META_BG| \
EXT4_FEATURE_INCOMPAT_EXTENTS| \
EXT4_FEATURE_INCOMPAT_64BIT| \
#define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
-@@ -981,6 +982,39 @@
+@@ -981,6 +982,39 @@ do { \
#endif
/*
* Function prototypes
*/
-Index: linux-2.6.27.21-0.1/fs/ext4/ext4_sb.h
+Index: linux-stage/fs/ext4/ext4_sb.h
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_sb.h 2009-07-07 14:36:00.000000000 +0530
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4_sb.h 2009-07-07 14:36:58.000000000 +0530
-@@ -149,6 +149,8 @@
+--- linux-stage.orig/fs/ext4/ext4_sb.h
++++ linux-stage/fs/ext4/ext4_sb.h
+@@ -149,6 +149,8 @@ struct ext4_sb_info {
unsigned int s_log_groups_per_flex;
struct flex_groups *s_flex_groups;
Description: Fix mkfs.lustre support for 16TB LUNs.
Severity : normal
+Bugzilla : 21564
+Description: Print mmp_check_interval
+Details : print mmp_check_interval and make it possible to abort
+ mount operation in case it takes too long.
+
+Severity : normal
Bugzilla : 21547
Description: Add cascading_rw to lustre mpi tests.
git://git.whamcloud.com / fs / lustre-release.git / commitdiff