From: Al Viro Date: Mon, 2 May 2016 23:45:47 +0000 (-0400) Subject: Merge getxattr prototype change into work.lookups X-Git-Tag: v4.14-rc1~3235^2~69 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84695ffee7987ee1e581be4c4696e47e1a29403b;p=platform%2Fkernel%2Flinux-rpi.git Merge getxattr prototype change into work.lookups The rest of work.xattr stuff isn't needed for this branch --- 84695ffee7987ee1e581be4c4696e47e1a29403b diff --cc fs/ecryptfs/mmap.c index e6b1d80,39e4381..148d11b --- a/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);