-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
-+++ linux-2.6.27.21-0.1/fs/ext4/super.c
+--- 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"
-@@ -598,6 +600,8 @@ static void ext4_put_super(struct super_
+@@ -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;
-@@ -806,7 +810,6 @@ static int ext4_show_options(struct seq_
+@@ -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);
/*
-@@ -829,6 +832,330 @@ static int ext4_show_options(struct seq_
+@@ -831,6 +834,340 @@ static int ext4_show_options(struct seq_
}
+ if (*bh)
+ clear_buffer_uptodate(*bh);
+
-+#if 0
-+ brelse(*bh);
-+
-+ *bh = sb_bread(sb, mmp_block);
-+#else
++ /* This would be sb_bread(sb, mmp_block), except we need to be sure
++ * that the MD RAID device cache has been bypassed, and that the read
++ * is not blocked in the elevator. */
+ if (!*bh)
+ *bh = sb_getblk(sb, mmp_block);
+ if (*bh) {
+ *bh = NULL;
+ }
+ }
-+#endif
+ if (!*bh) {
-+ ext4_warning(sb, __FUNCTION__,
++ ext4_warning(sb, __func__,
+ "Error while reading MMP block %lu", mmp_block);
+ return -EIO;
+ }
+ ext4_warning(sb, function, msg);
+ ext4_warning(sb, function, "MMP failure info: last update time: %llu, "
+ "last update node: %s, last update device: %s\n",
-+ le64_to_cpu(mmp->mmp_time), mmp->mmp_nodename,
-+ mmp->mmp_bdevname);
++ (long long unsigned int)le64_to_cpu(mmp->mmp_time),
++ mmp->mmp_nodename, mmp->mmp_bdevname);
+}
+
+/*
+ mmp->mmp_check_interval = cpu_to_le16(mmp_check_interval);
+ bdevname(bh->b_bdev, mmp->mmp_bdevname);
+
-+ down_read(&uts_sem);
+ memcpy(mmp->mmp_nodename, init_utsname()->sysname,
+ sizeof(mmp->mmp_nodename));
-+ up_read(&uts_sem);
+
+ while (!kthread_should_stop()) {
+ if (++seq > EXT4_MMP_SEQ_MAX)
+ * (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)
{
-@@ -2366,6 +2693,11 @@ static int ext4_fill_super(struct super_
+@@ -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!
-@@ -2566,6 +2898,8 @@ failed_mount3:
+@@ -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]);
-@@ -3080,7 +3414,7 @@ static int ext4_remount(struct super_blo
+@@ -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
-@@ -3205,6 +3539,13 @@ static int ext4_remount(struct super_blo
+@@ -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
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4.h
+--- 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 */
* 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
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4_sb.h
-@@ -150,6 +150,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;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff