diff --git a/[refs] b/[refs]
index 0b0a7fd52407..9af88ab77f9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad3bdefe877afb47480418fdb05ecd42842de65e
+refs/heads/master: 3a95ea1155c5d44aa58dde2f64f0ddafe27fd1fb
diff --git a/trunk/fs/fat/inode.c b/trunk/fs/fat/inode.c
index 6b74d09adbe5..de0004fe6e00 100644
--- a/trunk/fs/fat/inode.c
+++ b/trunk/fs/fat/inode.c
@@ -202,9 +202,9 @@ static sector_t _fat_bmap(struct address_space *mapping, sector_t block)
 	sector_t blocknr;
 
 	/* fat_get_cluster() assumes the requested blocknr isn't truncated. */
-	mutex_lock(&mapping->host->i_mutex);
+	down_read(&mapping->host->i_alloc_sem);
 	blocknr = generic_block_bmap(mapping, block, fat_get_block);
-	mutex_unlock(&mapping->host->i_mutex);
+	up_read(&mapping->host->i_alloc_sem);
 
 	return blocknr;
 }