Btrfs: Fix PAGE_CACHE_SHIFT shifts on 32 bit machines
authorChris Mason <chris.mason@oracle.com>
Tue, 30 Oct 2007 20:56:53 +0000 (16:56 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 25 Sep 2008 15:03:57 +0000 (11:03 -0400)
Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/disk-io.c
fs/btrfs/extent_map.c
fs/btrfs/file.c
fs/btrfs/inode.c
fs/btrfs/transaction.c

Simple merge
Simple merge
diff --cc fs/btrfs/file.c
Simple merge
Simple merge
Simple merge