Merge getxattr prototype change into work.lookups

The rest of work.xattr stuff isn't needed for this branch

diff --cc drivers/staging/lustre/lustre/llite/llite_internal.h
Simple merge

diff --cc fs/btrfs/tree-log.c
Simple merge

diff --cc fs/cifs/inode.c
Simple merge

diff --cc fs/ecryptfs/crypto.c
Simple merge

diff --cc fs/ecryptfs/inode.c
Simple merge

diff --cc fs/ecryptfs/mmap.c
index e6b1d80952b91d7dda9a3689fe018cf215ec5a11,39e4381d3a65fcb0aee5fe985dfcadaceefcae08..148d11b514fb4f04435993086bee782de361f5ad
--- 1/fs/ecryptfs/mmap.c
--- 2/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@@ -436,8 -436,9 +436,9 @@@ static int ecryptfs_write_inode_size_to
                goto out;
        }
        inode_lock(lower_inode);
-       size = lower_inode->i_op->getxattr(lower_dentry, ECRYPTFS_XATTR_NAME,
+       size = lower_inode->i_op->getxattr(lower_dentry, lower_inode,
+                                          ECRYPTFS_XATTR_NAME,
 -                                         xattr_virt, PAGE_CACHE_SIZE);
 +                                         xattr_virt, PAGE_SIZE);
        if (size < 0)
                size = 8;
        put_unaligned_be64(i_size_read(ecryptfs_inode), xattr_virt);

diff --cc fs/ext2/namei.c
Simple merge

diff --cc fs/f2fs/namei.c
Simple merge

diff --cc fs/hfsplus/xattr.c
Simple merge

diff --cc fs/libfs.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/nfs/direct.c
Simple merge

diff --cc fs/nilfs2/namei.c
Simple merge

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

diff --cc fs/orangefs/xattr.c
Simple merge

diff --cc fs/overlayfs/super.c
Simple merge

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

diff --cc fs/reiserfs/xattr.c
Simple merge

diff --cc fs/ubifs/ubifs.h
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc mm/shmem.c
Simple merge