diff options
author | Linus Torvalds | 2020-02-17 13:26:30 -0800 |
---|---|---|
committer | Linus Torvalds | 2020-02-17 13:26:30 -0800 |
commit | eaea2947063ac694cddff1787d43e7807490dbc7 (patch) | |
tree | b6d2a996bcd9c24ed26be363846a4abac9bb2f9f /fs/ecryptfs | |
parent | 11a48a5a18c63fd7621bb050228cebf13566e4d8 (diff) | |
parent | 52e29e331070cd7d52a64cbf1b0958212a340e28 (diff) |
Merge tag 'for-5.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fix from David Sterba:
"This is the fix for sleeping in a locked section bug reported by Dave
Jones, caused by a patch dependence in development and pulled
branches.
I picked the existing patch over the fixup that Filipe sent, as it's a
bit more generic fix. I've verified it with a specific test case, some
rsync stress and one round of fstests"
* tag 'for-5.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: don't set path->leave_spinning for truncate
Diffstat (limited to 'fs/ecryptfs')
0 files changed, 0 insertions, 0 deletions