projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch ->setxattr() to passing dentry and inode separately
[deliverable/linux.git]
/
fs
/
ecryptfs
/
crypto.c
diff --git
a/fs/ecryptfs/crypto.c
b/fs/ecryptfs/crypto.c
index ebd40f46ed4c455ef48a0dc8008127a98e956a6d..0d8eb3455b34d68cde59a48b5b46da9b67498445 100644
(file)
--- a/
fs/ecryptfs/crypto.c
+++ b/
fs/ecryptfs/crypto.c
@@
-1141,12
+1141,13
@@
ecryptfs_write_metadata_to_contents(struct inode *ecryptfs_inode,
static int
ecryptfs_write_metadata_to_xattr(struct dentry *ecryptfs_dentry,
static int
ecryptfs_write_metadata_to_xattr(struct dentry *ecryptfs_dentry,
+ struct inode *ecryptfs_inode,
char *page_virt, size_t size)
{
int rc;
char *page_virt, size_t size)
{
int rc;
- rc = ecryptfs_setxattr(ecryptfs_dentry,
ECRYPTFS_XATTR_NAME, page_virt
,
- size, 0);
+ rc = ecryptfs_setxattr(ecryptfs_dentry,
ecryptfs_inode
,
+
ECRYPTFS_XATTR_NAME, page_virt,
size, 0);
return rc;
}
return rc;
}
@@
-1215,8
+1216,8
@@
int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry,
goto out_free;
}
if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR)
goto out_free;
}
if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR)
- rc = ecryptfs_write_metadata_to_xattr(ecryptfs_dentry,
virt
,
- size);
+ rc = ecryptfs_write_metadata_to_xattr(ecryptfs_dentry,
ecryptfs_inode
,
+
virt,
size);
else
rc = ecryptfs_write_metadata_to_contents(ecryptfs_inode, virt,
virt_len);
else
rc = ecryptfs_write_metadata_to_contents(ecryptfs_inode, virt,
virt_len);
This page took
0.023924 seconds
and
5
git commands to generate.