Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95f71472 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ext4 bug fixes from Ted Ts'o:
 "These are two low-risk bug fixes for ext4, fixing a compile warning
  and a potential deadlock."

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  super.c: unused variable warning without CONFIG_QUOTA
  jbd2: use GFP_NOFS for blkdev_issue_flush
parents ce1ee9f5 db7e5c66

fs/ext4/super.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1597,7 +1597,9 @@ static int parse_options(char *options, struct super_block *sb, 
			 unsigned int *journal_ioprio,

			 unsigned int *journal_ioprio,

			 int is_remount)

			 int is_remount)

{

{

#ifdef CONFIG_QUOTA

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_sb_info *sbi = EXT4_SB(sb);

#endif

	char *p;

	char *p;

	substring_t args[MAX_OPT_ARGS];

	substring_t args[MAX_OPT_ARGS];

	int token;

	int token;

fs/jbd2/commit.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -723,7 +723,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) 
	if (commit_transaction->t_need_data_flush &&

	if (commit_transaction->t_need_data_flush &&

	    (journal->j_fs_dev != journal->j_dev) &&

	    (journal->j_fs_dev != journal->j_dev) &&

	    (journal->j_flags & JBD2_BARRIER))

	    (journal->j_flags & JBD2_BARRIER))

		blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);

		blkdev_issue_flush(journal->j_fs_dev, GFP_NOFS, NULL);





	/* Done it all: now write the commit record asynchronously. */

	/* Done it all: now write the commit record asynchronously. */

	if (JBD2_HAS_INCOMPAT_FEATURE(journal,

	if (JBD2_HAS_INCOMPAT_FEATURE(journal,
@@ -859,7 +859,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) 
	if (JBD2_HAS_INCOMPAT_FEATURE(journal,

	if (JBD2_HAS_INCOMPAT_FEATURE(journal,

				      JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT) &&

				      JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT) &&

	    journal->j_flags & JBD2_BARRIER) {

	    journal->j_flags & JBD2_BARRIER) {

		blkdev_issue_flush(journal->j_dev, GFP_KERNEL, NULL);

		blkdev_issue_flush(journal->j_dev, GFP_NOFS, NULL);

	}

	}





	if (err)

	if (err)