Commit e49d68ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 updates from Ted Ts'o:
 "Ext4 regression and bug fixes"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: inline jbd2_journal_[un]register_shrinker()
  ext4: fix flags validity checking for EXT4_IOC_CHECKPOINT
  ext4: fix possible UAF when remounting r/o a mmp-protected file system
  ext4: use ext4_grp_locked_error in mb_find_extent
  ext4: fix WARN_ON_ONCE(!buffer_uptodate) after an error writing the superblock
  Revert "ext4: consolidate checks for resize of bigalloc into ext4_resize_begin"
parents 47a7ce62 0705e8d1

fs/ext4/ext4_jbd2.c

+1 −1
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 


	set_buffer_meta(bh);

	set_buffer_prio(bh);

	set_buffer_uptodate(bh);

	if (ext4_handle_valid(handle)) {

		err = jbd2_journal_dirty_metadata(handle, bh);

		/* Errors can only happen due to aborted journal or a nasty bug */
@@ -355,7 +356,6 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 
					 err);

		}

	} else {

		set_buffer_uptodate(bh);

		if (inode)

			mark_buffer_dirty_inode(bh, inode);

		else

fs/ext4/ioctl.c

+15 −1
Original line number Diff line number Diff line
@@ -692,6 +692,13 @@ static long ext4_ioctl_group_add(struct file *file, 
	if (err)

		return err;



	if (ext4_has_feature_bigalloc(sb)) {

		ext4_msg(sb, KERN_ERR,

			 "Online resizing not supported with bigalloc");

		err = -EOPNOTSUPP;

		goto group_add_out;

	}



	err = mnt_want_write_file(file);

	if (err)

		goto group_add_out;
@@ -816,7 +823,7 @@ static int ext4_ioctl_checkpoint(struct file *filp, unsigned long arg) 
	if (!EXT4_SB(sb)->s_journal)

		return -ENODEV;



	if (flags & ~JBD2_JOURNAL_FLUSH_VALID)

	if (flags & ~EXT4_IOC_CHECKPOINT_FLAG_VALID)

		return -EINVAL;



	q = bdev_get_queue(EXT4_SB(sb)->s_journal->j_dev);
@@ -914,6 +921,13 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
			goto group_extend_out;

		}



		if (ext4_has_feature_bigalloc(sb)) {

			ext4_msg(sb, KERN_ERR,

				 "Online resizing not supported with bigalloc");

			err = -EOPNOTSUPP;

			goto group_extend_out;

		}



		err = mnt_want_write_file(filp);

		if (err)

			goto group_extend_out;

fs/ext4/mballoc.c

+5 −4
Original line number Diff line number Diff line
@@ -1909,7 +1909,8 @@ static int mb_find_extent(struct ext4_buddy *e4b, int block, 
	if (ex->fe_start + ex->fe_len > EXT4_CLUSTERS_PER_GROUP(e4b->bd_sb)) {

		/* Should never happen! (but apparently sometimes does?!?) */

		WARN_ON(1);

		ext4_error(e4b->bd_sb, "corruption or bug in mb_find_extent "

		ext4_grp_locked_error(e4b->bd_sb, e4b->bd_group, 0, 0,

			"corruption or bug in mb_find_extent "

			"block=%d, order=%d needed=%d ex=%u/%d/%d@%u",

			block, order, needed, ex->fe_group, ex->fe_start,

			ex->fe_len, ex->fe_logical);

fs/ext4/mmp.c

+15 −16
Original line number Diff line number Diff line
@@ -156,7 +156,12 @@ static int kmmpd(void *data) 
	memcpy(mmp->mmp_nodename, init_utsname()->nodename,

	       sizeof(mmp->mmp_nodename));



	while (!kthread_should_stop()) {

	while (!kthread_should_stop() && !sb_rdonly(sb)) {

		if (!ext4_has_feature_mmp(sb)) {

			ext4_warning(sb, "kmmpd being stopped since MMP feature"

				     " has been disabled.");

			goto wait_to_exit;

		}

		if (++seq > EXT4_MMP_SEQ_MAX)

			seq = 1;
@@ -177,16 +182,6 @@ static int kmmpd(void *data) 
			failed_writes++;

		}



		if (!(le32_to_cpu(es->s_feature_incompat) &

		    EXT4_FEATURE_INCOMPAT_MMP)) {

			ext4_warning(sb, "kmmpd being stopped since MMP feature"

				     " has been disabled.");

			goto exit_thread;

		}



		if (sb_rdonly(sb))

			break;



		diff = jiffies - last_update_time;

		if (diff < mmp_update_interval * HZ)

			schedule_timeout_interruptible(mmp_update_interval *
@@ -207,7 +202,7 @@ static int kmmpd(void *data) 
				ext4_error_err(sb, -retval,

					       "error reading MMP data: %d",

					       retval);

				goto exit_thread;

				goto wait_to_exit;

			}



			mmp_check = (struct mmp_struct *)(bh_check->b_data);
@@ -221,7 +216,7 @@ static int kmmpd(void *data) 
				ext4_error_err(sb, EBUSY, "abort");

				put_bh(bh_check);

				retval = -EBUSY;

				goto exit_thread;

				goto wait_to_exit;

			}

			put_bh(bh_check);

		}
@@ -244,7 +239,13 @@ static int kmmpd(void *data) 


	retval = write_mmp_block(sb, bh);



exit_thread:

wait_to_exit:

	while (!kthread_should_stop()) {

		set_current_state(TASK_INTERRUPTIBLE);

		if (!kthread_should_stop())

			schedule();

	}

	set_current_state(TASK_RUNNING);

	return retval;

}
@@ -391,5 +392,3 @@ int ext4_multi_mount_protect(struct super_block *sb, 
	brelse(bh);

	return 1;

}

fs/ext4/resize.c

+0 −4
Original line number Diff line number Diff line
@@ -74,10 +74,6 @@ int ext4_resize_begin(struct super_block *sb) 
		return -EPERM;

	}



	if (ext4_has_feature_bigalloc(sb)) {

		ext4_msg(sb, KERN_ERR, "Online resizing not supported with bigalloc");

		return -EOPNOTSUPP;

	}

	if (ext4_has_feature_sparse_super2(sb)) {

		ext4_msg(sb, KERN_ERR, "Online resizing not supported with sparse_super2");

		return -EOPNOTSUPP;