projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
[deliverable/linux.git]
/
fs
/
ecryptfs
/
inode.c
diff --git
a/fs/ecryptfs/inode.c
b/fs/ecryptfs/inode.c
index 318b04689d769b5da80d6ee39f6ded153a08e725..9d153b6a1d72308ae7130233697082b7028a3e51 100644
(file)
--- a/
fs/ecryptfs/inode.c
+++ b/
fs/ecryptfs/inode.c
@@
-1001,7
+1001,8
@@
static int ecryptfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
}
int
}
int
-ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,
+ecryptfs_setxattr(struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value,
size_t size, int flags)
{
int rc = 0;
size_t size, int flags)
{
int rc = 0;
@@
-1014,8
+1015,8
@@
ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,
}
rc = vfs_setxattr(lower_dentry, name, value, size, flags);
}
rc = vfs_setxattr(lower_dentry, name, value, size, flags);
- if (!rc &&
d_really_is_positive(dentry)
)
- fsstack_copy_attr_all(
d_inode(dentry)
, d_inode(lower_dentry));
+ if (!rc &&
inode
)
+ fsstack_copy_attr_all(
inode
, d_inode(lower_dentry));
out:
return rc;
}
out:
return rc;
}
This page took
0.025526 seconds
and
5
git commands to generate.