===================================================================
--- linux-stage.orig/fs/ext4/super.c
+++ linux-stage/fs/ext4/super.c
-@@ -38,6 +38,8 @@
+@@ -40,6 +40,8 @@
#include <linux/log2.h>
#include <linux/crc16.h>
#include <asm/uaccess.h>
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -617,6 +619,8 @@ static void ext4_put_super(struct super_
+@@ -660,6 +662,8 @@ static void ext4_put_super(struct super_
invalidate_bdev(sbi->journal_bdev, 0);
ext4_blkdev_remove(sbi);
}
+ if (sbi->s_mmp_tsk)
+ kthread_stop(sbi->s_mmp_tsk);
sb->s_fs_info = NULL;
- kfree(sbi);
- return;
-@@ -864,6 +868,345 @@ static int ext4_show_options(struct seq_
+ /*
+ * Now that we are completely done shutting down the
+@@ -921,6 +925,354 @@ static int ext4_show_options(struct seq_
return 0;
}
+ */
+static int kmmpd(void *data)
+{
-+ struct super_block *sb = (struct super_block *) data;
++ struct super_block *sb = ((struct mmpd_data *) data)->sb;
++ struct buffer_head *bh = ((struct mmpd_data *) data)->bh;
+ struct ext4_super_block *es = EXT4_SB(sb)->s_es;
-+ struct buffer_head *bh = NULL;
+ struct mmp_struct *mmp;
+ unsigned long mmp_block;
+ u32 seq = 0;
+ int retval;
+
+ mmp_block = le64_to_cpu(es->s_mmp_block);
-+ retval = read_mmp_block(sb, &bh, mmp_block);
-+ if (retval)
-+ goto failed;
-+
+ mmp = (struct mmp_struct *)(bh->b_data);
+ mmp->mmp_time = cpu_to_le64(get_seconds());
+ /*
+ * Start with the higher mmp_check_interval and reduce it if
+ * the MMP block is being updated on time.
+ */
-+ mmp_check_interval = max(5 * mmp_update_interval,
++ mmp_check_interval = max(5UL * mmp_update_interval,
+ EXT4_MMP_MIN_CHECK_INTERVAL);
+ mmp->mmp_check_interval = cpu_to_le16(mmp_check_interval);
+ bdevname(bh->b_bdev, mmp->mmp_bdevname);
+ EXT4_FEATURE_INCOMPAT_MMP)) {
+ ext4_warning(sb, __func__, "kmmpd being stopped "
+ "since MMP feature has been disabled.");
-+ EXT4_SB(sb)->s_mmp_tsk = 0;
++ EXT4_SB(sb)->s_mmp_tsk = NULL;
+ goto failed;
+ }
+
+ ext4_warning(sb, __func__, "kmmpd being stopped "
+ "since filesystem has been remounted as "
+ "readonly.");
-+ EXT4_SB(sb)->s_mmp_tsk = 0;
++ EXT4_SB(sb)->s_mmp_tsk = NULL;
+ goto failed;
+ }
+
+
+ retval = read_mmp_block(sb, &bh_check, mmp_block);
+ if (retval) {
-+ EXT4_SB(sb)->s_mmp_tsk = 0;
++ ext4_error(sb, __func__, "error reading MMP"
++ "data: %d", retval);
++ EXT4_SB(sb)->s_mmp_tsk = NULL;
+ goto failed;
+ }
+
+ mmp_check = (struct mmp_struct *)(bh_check->b_data);
-+ if (mmp->mmp_time != mmp_check->mmp_time ||
++ if (mmp->mmp_seq != mmp_check->mmp_seq ||
+ memcmp(mmp->mmp_nodename, mmp_check->mmp_nodename,
-+ sizeof(mmp->mmp_nodename)))
++ sizeof(mmp->mmp_nodename))) {
+ dump_mmp_msg(sb, mmp_check, __func__,
+ "Error while updating MMP info. "
+ "The filesystem seems to have "
+ "been multiply mounted.");
-+
++ ext4_error(sb, __func__, "abort");
++ goto failed;
++ }
+ put_bh(bh_check);
+ }
+
+ * Adjust the mmp_check_interval depending on how much time
+ * it took for the MMP block to be written.
+ */
-+ mmp_check_interval = max(5 * diff / HZ,
-+ (unsigned long) EXT4_MMP_MIN_CHECK_INTERVAL);
++ mmp_check_interval = max(min(5 * diff / HZ,
++ EXT4_MMP_MAX_CHECK_INTERVAL),
++ EXT4_MMP_MIN_CHECK_INTERVAL);
+ mmp->mmp_check_interval = cpu_to_le16(mmp_check_interval);
+ }
+
+ struct ext4_super_block *es = EXT4_SB(sb)->s_es;
+ struct buffer_head *bh = NULL;
+ struct mmp_struct *mmp = NULL;
++ struct mmpd_data *mmpd_data;
+ u32 seq;
+ unsigned int mmp_check_interval = le16_to_cpu(es->s_mmp_update_interval);
+ unsigned int wait_time = 0;
+ goto failed;
+ }
+
++ mmpd_data = kmalloc(sizeof(struct mmpd_data *), GFP_KERNEL);
++ if (!mmpd_data) {
++ ext4_warning(sb, KERN_ERR, "not enough memory for mmpd_data");
++ goto failed;
++ }
++ mmpd_data->sb = sb;
++ mmpd_data->bh = bh;
++
+ /*
+ * Start a kernel thread to update the MMP block periodically.
+ */
-+ EXT4_SB(sb)->s_mmp_tsk = kthread_run(kmmpd, sb, "kmmpd-%02x:%02x",
-+ MAJOR(sb->s_dev),
-+ MINOR(sb->s_dev));
++ EXT4_SB(sb)->s_mmp_tsk = kthread_run(kmmpd, mmpd_data, "kmmpd-%s",
++ bdevname(bh->b_bdev,
++ mmp->mmp_bdevname));
+ if (IS_ERR(EXT4_SB(sb)->s_mmp_tsk)) {
-+ EXT4_SB(sb)->s_mmp_tsk = 0;
++ EXT4_SB(sb)->s_mmp_tsk = NULL;
+ ext4_warning(sb, __func__, "Unable to create kmmpd thread "
+ "for %s.", sb->s_id);
+ goto failed;
+ }
+
-+ brelse(bh);
+ return 0;
+
+failed:
static struct dentry *ext4_get_dentry(struct super_block *sb, void *vobjp)
{
-@@ -873,7 +1216,6 @@ static struct dentry *ext4_get_dentry(st
+@@ -930,7 +1282,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))
-@@ -2407,6 +2749,11 @@ static int ext4_fill_super(struct super_
+@@ -2740,6 +3091,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!
-@@ -2621,6 +2968,8 @@ failed_mount3:
+@@ -2978,6 +3334,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]);
-@@ -3142,7 +3491,7 @@ static int ext4_remount(struct super_blo
+@@ -3488,7 +3846,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;
#ifdef CONFIG_QUOTA
int i;
#endif
-@@ -3278,6 +3627,13 @@ static int ext4_remount(struct super_blo
+@@ -3607,6 +3965,13 @@ static int ext4_remount(struct super_blo
goto restore_opts;
if (!ext4_setup_super(sb, es, 0))
sb->s_flags &= ~MS_RDONLY;
+ }
}
}
- if (sbi->s_journal == NULL)
+ ext4_setup_system_zone(sb);
Index: linux-stage/fs/ext4/ext4.h
===================================================================
--- linux-stage.orig/fs/ext4/ext4.h
+++ linux-stage/fs/ext4/ext4.h
-@@ -665,7 +665,7 @@ struct ext4_super_block {
+@@ -851,7 +851,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 */
-@@ -782,7 +782,8 @@ static inline int ext4_valid_inum(struct
+@@ -1005,6 +1005,9 @@ struct ext4_sb_info {
+
+ /* workqueue for dio unwritten */
+ struct workqueue_struct *dio_unwritten_wq;
++
++ /* Kernel thread for multiple mount protection */
++ struct task_struct *s_mmp_tsk;
+ };
+
+ static inline struct ext4_sb_info *EXT4_SB(struct super_block *sb)
+@@ -1114,7 +1117,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| \
-@@ -995,6 +996,39 @@ do { \
- #endif
+@@ -1296,6 +1300,50 @@ void ext4_get_group_no_and_offset(struct
+ extern struct proc_dir_entry *ext4_proc_root;
/*
+ * This structure will be used for multiple mount protection. It will be
+ __le32 mmp_pad2[227];
+};
+
++/* arguments passed to the mmp thread */
++struct mmpd_data {
++ struct buffer_head *bh; /* bh from initial read_mmp_block() */
++ struct super_block *sb; /* super block of the fs */
++};
++
+/*
+ * Default interval in seconds to update the MMP sequence number.
+ */
+/*
+ * Minimum interval for MMP checking in seconds.
+ */
-+#define EXT4_MMP_MIN_CHECK_INTERVAL 5
++#define EXT4_MMP_MIN_CHECK_INTERVAL 5UL
++
++/*
++ * Maximum interval for MMP checking in seconds.
++ */
++#define EXT4_MMP_MAX_CHECK_INTERVAL 300UL
+
+/*
* Function prototypes
*/
-Index: linux-stage/fs/ext4/ext4.h
-===================================================================
---- linux-stage.orig/fs/ext4/ext4.h
-+++ linux-stage/fs/ext4/ext4.h
-@@ -149,6 +149,8 @@ struct ext4_sb_info {
-
- /* workqueue for dio unwritten */
- struct workqueue_struct *dio_unwritten_wq;
-+
-+ struct task_struct *s_mmp_tsk; /* Kernel thread for multiple mount protection */
- };
-
- #endif /* _EXT4_SB */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff