1 files changed, 6 insertions, 8 deletions

diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index cfce53cb65d7..2d38d1d150ef 100644
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -29,6 +29,7 @@
 #include <linux/buffer_head.h>
 #include <linux/writeback.h>
 #include <linux/bit_spinlock.h>
+#include <linux/interrupt.h>
 
 #include "aops.h"
 #include "attrib.h"
@@ -107,8 +108,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
                                 "0x%llx.", (unsigned long long)bh->b_blocknr);
         }
         first = page_buffers(page);
-        local_irq_save(flags);
-        bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
+        spin_lock_irqsave(&first->b_uptodate_lock, flags);
         clear_buffer_async_read(bh);
         unlock_buffer(bh);
         tmp = bh;
@@ -123,8 +123,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
                 }
                 tmp = tmp->b_this_page;
         } while (tmp != bh);
-        bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-        local_irq_restore(flags);
+        spin_unlock_irqrestore(&first->b_uptodate_lock, flags);
         /*
          * If none of the buffers had errors then we can set the page uptodate,
          * but we first have to perform the post read mst fixups, if the
@@ -145,13 +144,13 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
                 recs = PAGE_CACHE_SIZE / rec_size;
                 /* Should have been verified before we got here... */
                 BUG_ON(!recs);
-                local_irq_save(flags);
+                local_irq_save_nort(flags);
                 kaddr = kmap_atomic(page, KM_BIO_SRC_IRQ);
                 for (i = 0; i < recs; i++)
                         post_read_mst_fixup((NTFS_RECORD*)(kaddr +
                                         i * rec_size), rec_size);
                 kunmap_atomic(kaddr, KM_BIO_SRC_IRQ);
-                local_irq_restore(flags);
+                local_irq_restore_nort(flags);
                 flush_dcache_page(page);
                 if (likely(page_uptodate && !PageError(page)))
                         SetPageUptodate(page);
@@ -159,8 +158,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
         unlock_page(page);
         return;
 still_busy:
-        bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-        local_irq_restore(flags);
+        spin_unlock_irqrestore(&first->b_uptodate_lock, flags);
         return;
 }