X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fext3-mmp-2.6.18-vanilla.patch;h=84ececf07ad887af13fa588e9baee0cefa6e81e5;hb=2d3aaef4122c11dcb6d892da89522ffa37036136;hp=b7c4a1c95207daf10c85325878166fecb3b610b0;hpb=4d5b2e7e9f7e877bd51c5d3d9b36077a88f05dd1;p=fs%2Flustre-release.git diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch index b7c4a1c..84ececf 100644 --- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch +++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.18/fs/ext3/super.c +Index: linux-stage/fs/ext3/super.c =================================================================== ---- linux-2.6.18.orig/fs/ext3/super.c -+++ linux-2.6.18/fs/ext3/super.c +--- linux-stage.orig/fs/ext3/super.c ++++ linux-stage/fs/ext3/super.c @@ -35,6 +35,8 @@ #include #include @@ -11,17 +11,61 @@ Index: linux-2.6.18/fs/ext3/super.c #include -@@ -435,6 +437,9 @@ static void ext3_put_super (struct super +@@ -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_mmp_tsk) + kthread_stop(sbi->s_mmp_tsk); -+ - sb->s_fs_info = NULL; - kfree(sbi); - return; -@@ -1528,6 +1533,313 @@ static ext3_fsblk_t descriptor_loc(struc + if (sbi->s_dev_proc) { + remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3); + sbi->s_dev_proc = NULL; +@@ -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)); } @@ -55,11 +99,27 @@ Index: linux-2.6.18/fs/ext3/super.c + if (*bh) + clear_buffer_uptodate(*bh); + ++#if 0 + brelse(*bh); + + *bh = sb_bread(sb, mmp_block); ++#else ++ if (!*bh) ++ *bh = sb_getblk(sb, mmp_block); ++ if (*bh) { ++ get_bh(*bh); ++ lock_buffer(*bh); ++ (*bh)->b_end_io = end_buffer_read_sync; ++ submit_bh(READ_SYNC, *bh); ++ wait_on_buffer(*bh); ++ if (!buffer_uptodate(*bh)) { ++ brelse(*bh); ++ *bh = NULL; ++ } ++ } ++#endif + if (!*bh) { -+ ext3_warning(sb, __FUNCTION__, ++ ext3_warning(sb, __func__, + "Error while reading MMP block %lu", mmp_block); + return -EIO; + } @@ -137,21 +197,21 @@ Index: linux-2.6.18/fs/ext3/super.c + * (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; @@ -183,7 +243,7 @@ Index: linux-2.6.18/fs/ext3/super.c + 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."); @@ -239,11 +299,12 @@ Index: linux-2.6.18/fs/ext3/super.c + 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; + } @@ -269,19 +330,31 @@ Index: linux-2.6.18/fs/ext3/super.c + 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; + } @@ -299,14 +372,18 @@ Index: linux-2.6.18/fs/ext3/super.c + /* + * 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; + } @@ -319,7 +396,7 @@ Index: linux-2.6.18/fs/ext3/super.c + 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; + } @@ -335,7 +412,7 @@ Index: linux-2.6.18/fs/ext3/super.c static int ext3_fill_super (struct super_block *sb, void *data, int silent) { -@@ -1844,6 +2156,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)); @@ -347,7 +424,28 @@ Index: linux-2.6.18/fs/ext3/super.c /* * The first inode we look at is the journal inode. Don't try * root first: it may be modified in the journal! -@@ -2446,7 +2763,7 @@ static int ext3_remount (struct super_bl +@@ -2012,6 +2361,8 @@ cantfind_ext3: + failed_mount4: + journal_destroy(sbi->s_journal); + failed_mount3: ++ if (sbi->s_mmp_tsk) ++ kthread_stop(sbi->s_mmp_tsk); + percpu_counter_destroy(&sbi->s_freeblocks_counter); + percpu_counter_destroy(&sbi->s_freeinodes_counter); + percpu_counter_destroy(&sbi->s_dirs_counter); +@@ -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; @@ -356,23 +454,34 @@ Index: linux-2.6.18/fs/ext3/super.c #ifdef CONFIG_QUOTA int i; #endif -@@ -2530,6 +2847,11 @@ 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; + if (EXT3_HAS_INCOMPAT_FEATURE(sb, + EXT3_FEATURE_INCOMPAT_MMP)) + if (ext3_multi_mount_protect(sb, -+ le64_to_cpu(es->s_mmp_block))) ++ le64_to_cpu(es->s_mmp_block))) { ++ err = -EROFS; + goto restore_opts; ++ } } } #ifdef CONFIG_QUOTA -Index: linux-2.6.18/include/linux/ext3_fs.h +Index: linux-stage/include/linux/ext3_fs.h =================================================================== ---- linux-2.6.18.orig/include/linux/ext3_fs.h -+++ linux-2.6.18/include/linux/ext3_fs.h -@@ -593,13 +593,17 @@ struct ext3_super_block { +--- 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 */ __le32 s_jnl_blocks[17]; /* Backup of the journal inode */ @@ -393,7 +502,7 @@ Index: linux-2.6.18/include/linux/ext3_fs.h }; #ifdef __KERNEL__ -@@ -702,12 +706,14 @@ static inline int ext3_valid_inum(struct +@@ -703,12 +707,14 @@ static inline int ext3_valid_inum(struct #define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */ #define EXT3_FEATURE_INCOMPAT_META_BG 0x0010 #define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040 /* extents support */ @@ -409,7 +518,7 @@ Index: linux-2.6.18/include/linux/ext3_fs.h #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \ EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \ EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \ -@@ -870,6 +876,39 @@ ext3_group_first_block_no(struct super_b +@@ -871,6 +877,39 @@ ext3_group_first_block_no(struct super_b #define ERR_BAD_DX_DIR -75000 /* @@ -449,11 +558,11 @@ Index: linux-2.6.18/include/linux/ext3_fs.h * Function prototypes */ -Index: linux-2.6.18/include/linux/ext3_fs_sb.h +Index: linux-stage/include/linux/ext3_fs_sb.h =================================================================== ---- linux-2.6.18.orig/include/linux/ext3_fs_sb.h -+++ linux-2.6.18/include/linux/ext3_fs_sb.h -@@ -151,6 +151,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;