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

Commit 20d698db authored by Jens Axboe's avatar Jens Axboe
Browse files

splice: move balance_dirty_pages_ratelimited() outside of splice actor 



I've seen inode related deadlocks, so move this call outside of the
actor itself, which may hold the inode lock.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 17374ff1

fs/splice.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -652,7 +652,6 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf, 
	 * accessed, we are now done!

	 * accessed, we are now done!

	 */

	 */

	mark_page_accessed(page);

	mark_page_accessed(page);

	balance_dirty_pages_ratelimited(mapping);

out:

out:

	page_cache_release(page);

	page_cache_release(page);

	unlock_page(page);

	unlock_page(page);
@@ -823,6 +822,7 @@ generic_file_splice_write_nolock(struct pipe_inode_info *pipe, struct file *out, 
			if (err)

			if (err)

				ret = err;

				ret = err;

		}

		}

		balance_dirty_pages_ratelimited(mapping);

	}

	}





	return ret;

	return ret;
@@ -876,6 +876,7 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, 
			if (err)

			if (err)

				ret = err;

				ret = err;

		}

		}

		balance_dirty_pages_ratelimited(mapping);

	}

	}





	return ret;

	return ret;