From 6bd5d5fe967aa7f46d638188d092c2d1ff7bb2b8 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 11 Mar 2009 12:04:51 -0700 Subject: [PATCH] --- yaml --- r: 132187 b: refs/heads/master c: f809e5a21f05b4aaeef0f9b191c01438d392fa5a h: refs/heads/master i: 132185: fc5c2bad95d85f4101d43078c80234d818c09953 132183: ab2f59acf093e9603ca4ea53b3b0e1f29e5bc1e0 v: v3 --- [refs] | 2 +- trunk/fs/fat/inode.c | 4 ++-- trunk/fs/proc/page.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0d01e6397420..45ff4d07e550 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 211b3d03c7400f48a781977a50104c9d12f4e229 +refs/heads/master: f809e5a21f05b4aaeef0f9b191c01438d392fa5a 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; } diff --git a/trunk/fs/proc/page.c b/trunk/fs/proc/page.c index 2d1345112a42..e9983837d08d 100644 --- a/trunk/fs/proc/page.c +++ b/trunk/fs/proc/page.c @@ -80,7 +80,7 @@ static const struct file_operations proc_kpagecount_operations = { #define KPF_RECLAIM 9 #define KPF_BUDDY 10 -#define kpf_copy_bit(flags, srcpos, dstpos) (((flags >> srcpos) & 1) << dstpos) +#define kpf_copy_bit(flags, dstpos, srcpos) (((flags >> srcpos) & 1) << dstpos) static ssize_t kpageflags_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)