From 9e06b98f71663941de871bc15e8abfb6bc413319 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 30 Jan 2007 14:36:24 -0800
Subject: [PATCH] --- yaml --- r: 45999 b: refs/heads/master c:
 fa8609da993b04dc2dd762173a6d0ab1a192e256 h: refs/heads/master i:   45997:
 7728075b3ba7a1db50fcb984336b9a1c04e414ac   45995:
 002a817f4720c46c1619f8d862a9ac6bc141071d   45991:
 328d97def5d98d50069024a62bed13922bb13af2   45983:
 ad79db6dfe640cc3f18ba491b489904511d44a76 v: v3

---
 [refs]               | 2 +-
 trunk/fs/ntfs/aops.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6085ea4d2f90..223e6a22dace 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3896625d0badd53dbc34d584861a36ba7eb4613f
+refs/heads/master: fa8609da993b04dc2dd762173a6d0ab1a192e256
diff --git a/trunk/fs/ntfs/aops.c b/trunk/fs/ntfs/aops.c
index 7b2c8f4f6a6f..629e7abdd840 100644
--- a/trunk/fs/ntfs/aops.c
+++ b/trunk/fs/ntfs/aops.c
@@ -92,10 +92,12 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
 			ofs = 0;
 			if (file_ofs < init_size)
 				ofs = init_size - file_ofs;
+			local_irq_save(flags);
 			kaddr = kmap_atomic(page, KM_BIO_SRC_IRQ);
 			memset(kaddr + bh_offset(bh) + ofs, 0,
 					bh->b_size - ofs);
 			kunmap_atomic(kaddr, KM_BIO_SRC_IRQ);
+			local_irq_restore(flags);
 			flush_dcache_page(page);
 		}
 	} else {
@@ -143,11 +145,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);
 		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);
 		flush_dcache_page(page);
 		if (likely(page_uptodate && !PageError(page)))
 			SetPageUptodate(page);