git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
nilfs2: fix lock order reversal in nilfs_clean_segments ioctl
[safe/jmp/linux-2.6]
/
fs
/
ntfs
/
compress.c
diff --git
a/fs/ntfs/compress.c
b/fs/ntfs/compress.c
index
33ff314
..
9669541
100644
(file)
--- a/
fs/ntfs/compress.c
+++ b/
fs/ntfs/compress.c
@@
-665,7
+665,7
@@
lock_retry_remap:
for (i = 0; i < nr_bhs; i++) {
struct buffer_head *tbh = bhs[i];
- if (
unlikely(test_set_buffer_locked(tbh)
))
+ if (
!trylock_buffer(tbh
))
continue;
if (unlikely(buffer_uptodate(tbh))) {
unlock_buffer(tbh);