Merge branch 'linus' into x86/tracehook

Conflicts:
	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 790defb847e7..17d32ca6bc35 100644
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -586,7 +586,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no,
                 for (i_bhs = 0; i_bhs < nr_bhs; i_bhs++) {
                         struct buffer_head *tbh = bhs[i_bhs];
 
-                        if (unlikely(test_set_buffer_locked(tbh)))
+                        if (!trylock_buffer(tbh))
                                 BUG();
                         BUG_ON(!buffer_uptodate(tbh));
                         clear_buffer_dirty(tbh);
@@ -779,7 +779,7 @@ int write_mft_record_nolock(ntfs_inode *ni, MFT_RECORD *m, int sync)
         for (i_bhs = 0; i_bhs < nr_bhs; i_bhs++) {
                 struct buffer_head *tbh = bhs[i_bhs];
 
-                if (unlikely(test_set_buffer_locked(tbh)))
+                if (!trylock_buffer(tbh))
                         BUG();
                 BUG_ON(!buffer_uptodate(tbh));
                 clear_buffer_dirty(tbh);