From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Aug 2011 07:14:05 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs... 
X-Git-Tag: v3.1-rc1~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed8f37370d83e695c0a4fa5d5fc7a83ecb947526;p=platform%2Fkernel%2Flinux-3.10.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: (31 commits)
  Btrfs: don't call writepages from within write_full_page
  Btrfs: Remove unused variable 'last_index' in file.c
  Btrfs: clean up for find_first_extent_bit()
  Btrfs: clean up for wait_extent_bit()
  Btrfs: clean up for insert_state()
  Btrfs: remove unused members from struct extent_state
  Btrfs: clean up code for merging extent maps
  Btrfs: clean up code for extent_map lookup
  Btrfs: clean up search_extent_mapping()
  Btrfs: remove redundant code for dir item lookup
  Btrfs: make acl functions really no-op if acl is not enabled
  Btrfs: remove remaining ref-cache code
  Btrfs: remove a BUG_ON() in btrfs_commit_transaction()
  Btrfs: use wait_event()
  Btrfs: check the nodatasum flag when writing compressed files
  Btrfs: copy string correctly in INO_LOOKUP ioctl
  Btrfs: don't print the leaf if we had an error
  btrfs: make btrfs_set_root_node void
  Btrfs: fix oops while writing data to SSD partitions
  Btrfs: Protect the readonly flag of block group
  ...

Fix up trivial conflicts (due to acl and writeback cleanups) in
 - fs/btrfs/acl.c
 - fs/btrfs/ctree.h
 - fs/btrfs/extent_io.c
---

ed8f37370d83e695c0a4fa5d5fc7a83ecb947526
diff --cc fs/btrfs/acl.c
index 4cc5c01,b206d4c..eb159aa
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@@ -28,9 -28,7 +28,7 @@@
  #include "btrfs_inode.h"
  #include "xattr.h"
  
- #ifdef CONFIG_BTRFS_FS_POSIX_ACL
- 
 -static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
 +struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
  {
  	int size;
  	const char *name;
diff --cc fs/btrfs/ctree.h
index 365c4e1,a6263bd..0469263
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@@ -2647,13 -2649,22 +2652,22 @@@ do {								
  
  /* acl.c */
  #ifdef CONFIG_BTRFS_FS_POSIX_ACL
 -int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags);
 +struct posix_acl *btrfs_get_acl(struct inode *inode, int type);
- #else
- #define btrfs_get_acl NULL
- #endif
  int btrfs_init_acl(struct btrfs_trans_handle *trans,
  		   struct inode *inode, struct inode *dir);
  int btrfs_acl_chmod(struct inode *inode);
+ #else
 -#define btrfs_check_acl NULL
++#define btrfs_get_acl NULL
+ static inline int btrfs_init_acl(struct btrfs_trans_handle *trans,
+ 				 struct inode *inode, struct inode *dir)
+ {
+ 	return 0;
+ }
+ static inline int btrfs_acl_chmod(struct inode *inode)
+ {
+ 	return 0;
+ }
+ #endif
  
  /* relocation.c */
  int btrfs_relocate_block_group(struct btrfs_root *root, u64 group_start);