projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[linux-block.git]
/
fs
/
ntfs
/
compress.c
diff --git
a/fs/ntfs/compress.c
b/fs/ntfs/compress.c
index 33ff314cc5073cf9f88a3623db7129fd4ad4e772..9669541d01193813f93a7a39616511be3bca00e9 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);