From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2011 20:57:12 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a0c3061093c8b49facef95dc09a618c6e0d17cb5;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'for-linus' of git://git./linux/kernel/git/mason/btrfs-unstable

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (58 commits)
  Btrfs: use the device_list_mutex during write_dev_supers
  Btrfs: setup free ino caching in a more asynchronous way
  btrfs scrub: don't coalesce pages that are logically discontiguous
  Btrfs: return -ENOMEM in clear_extent_bit
  Btrfs: add mount -o auto_defrag
  Btrfs: using rcu lock in the reader side of devices list
  Btrfs: drop unnecessary device lock
  Btrfs: fix the race between remove dev and alloc chunk
  Btrfs: fix the race between reading and updating devices
  Btrfs: fix bh leak on __btrfs_open_devices path
  Btrfs: fix unsafe usage of merge_state
  Btrfs: allocate extent state and check the result properly
  fs/btrfs: Add missing btrfs_free_path
  Btrfs: check return value of btrfs_inc_extent_ref()
  Btrfs: return error to caller if read_one_inode() fails
  Btrfs: BUG_ON is deleted from the caller of btrfs_truncate_item & btrfs_extend_item
  Btrfs: return error code to caller when btrfs_del_item fails
  Btrfs: return error code to caller when btrfs_previous_item fails
  btrfs: fix typo 'testeing' -> 'testing'
  btrfs: typo: 'btrfS' -> 'btrfs'
  ...
---

a0c3061093c8b49facef95dc09a618c6e0d17cb5
diff --cc fs/btrfs/extent_io.c
index 4f9893243dae,0e0fe0f6ec75..c5d9fbb92bc3
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -2155,9 -2100,8 +2109,9 @@@ static int __extent_read_full_page(stru
  		if (ret)
  			SetPageError(page);
  		cur = cur + iosize;
- 		page_offset += iosize;
+ 		pg_offset += iosize;
  	}
 +out:
  	if (!nr) {
  		if (!PageError(page))
  			SetPageUptodate(page);
diff --cc fs/btrfs/super.c
index be4ffa12f3ef,28e3cb2607ff..9b2e7e5bc3ef
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -39,8 -39,8 +39,9 @@@
  #include <linux/miscdevice.h>
  #include <linux/magic.h>
  #include <linux/slab.h>
 +#include <linux/cleancache.h>
  #include "compat.h"
+ #include "delayed-inode.h"
  #include "ctree.h"
  #include "disk-io.h"
  #include "transaction.h"