diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-27 16:31:09 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-27 16:31:09 (GMT) |
| commit | e1f8826f5159d4aca5709c5d8d427319665fd5a1 (patch) | |
| tree | 2a42d2bffe5acb222d732d72b1bd4c002b683029 /fs/locks.c | |
| parent | 730d7d339884f20da28b59bf6f0a16af6400a113 (diff) | |
| parent | 721a769c034204e8e5f6ca4ecbff249e0225333b (diff) | |
| download | linux-fsl-qoriq-e1f8826f5159d4aca5709c5d8d427319665fd5a1.tar.xz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull reiserfs and UDF fixes from Jan Kara:
"The contains fix of an UDF oops when mounting corrupted media and a
fix of a race in reiserfs leading to oops"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
reiserfs: fix race with flush_used_journal_lists and flush_journal_list
reiserfs: remove useless flush_old_journal_lists
udf: Fortify LVID loading
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions