Merge getxattr prototype change into work.lookups
The rest of work.xattr stuff isn't needed for this branch
This commit is contained in:
@@ -1369,7 +1369,9 @@ int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode)
|
||||
ssize_t size;
|
||||
int rc = 0;
|
||||
|
||||
size = ecryptfs_getxattr_lower(lower_dentry, ECRYPTFS_XATTR_NAME,
|
||||
size = ecryptfs_getxattr_lower(lower_dentry,
|
||||
ecryptfs_inode_to_lower(ecryptfs_inode),
|
||||
ECRYPTFS_XATTR_NAME,
|
||||
page_virt, ECRYPTFS_DEFAULT_EXTENT_SIZE);
|
||||
if (size < 0) {
|
||||
if (unlikely(ecryptfs_verbosity > 0))
|
||||
@@ -1391,6 +1393,7 @@ int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry,
|
||||
int rc;
|
||||
|
||||
rc = ecryptfs_getxattr_lower(ecryptfs_dentry_to_lower(dentry),
|
||||
ecryptfs_inode_to_lower(inode),
|
||||
ECRYPTFS_XATTR_NAME, file_size,
|
||||
ECRYPTFS_SIZE_AND_MARKER_BYTES);
|
||||
if (rc < ECRYPTFS_SIZE_AND_MARKER_BYTES)
|
||||
|
Reference in New Issue
Block a user