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

Commit a4a39040 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: check return value of blkdev_issue_flush() 


    
blkdev_issue_flush() can fail; make sure the error gets properly
propagated.
    
This is a port of the equivalent ext3 patch from commit 44f4f729.
    
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 316e4cfd

fs/ext4/fsync.c

+6 −3
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
	struct inode *inode = file->f_mapping->host;

	struct ext4_inode_info *ei = EXT4_I(inode);

	journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;

	int ret;

	int ret, err;

	tid_t commit_tid;

	bool needs_barrier = false;
@@ -255,8 +255,11 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
		needs_barrier = true;

	jbd2_log_start_commit(journal, commit_tid);

	ret = jbd2_log_wait_commit(journal, commit_tid);

	if (needs_barrier)

		blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);

	if (needs_barrier) {

		err = blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);

		if (!ret)

			ret = err;

	}

 out:

	mutex_unlock(&inode->i_mutex);

	trace_ext4_sync_file_exit(inode, ret);