projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[cascardo/linux.git]
/
fs
/
ocfs2
/
xattr.c
diff --git
a/fs/ocfs2/xattr.c
b/fs/ocfs2/xattr.c
index
f19b738
..
5bb44f7
100644
(file)
--- a/
fs/ocfs2/xattr.c
+++ b/
fs/ocfs2/xattr.c
@@
-7246,18
+7246,19
@@
leave:
* 'security' attributes support
*/
static int ocfs2_xattr_security_get(const struct xattr_handler *handler,
* 'security' attributes support
*/
static int ocfs2_xattr_security_get(const struct xattr_handler *handler,
- struct dentry *
dentry, const char *nam
e,
- void *buffer, size_t size)
+ struct dentry *
unused, struct inode *inod
e,
+
const char *name,
void *buffer, size_t size)
{
{
- return ocfs2_xattr_get(
d_inode(dentry)
, OCFS2_XATTR_INDEX_SECURITY,
+ return ocfs2_xattr_get(
inode
, OCFS2_XATTR_INDEX_SECURITY,
name, buffer, size);
}
static int ocfs2_xattr_security_set(const struct xattr_handler *handler,
name, buffer, size);
}
static int ocfs2_xattr_security_set(const struct xattr_handler *handler,
- struct dentry *dentry, const char *name,
- const void *value, size_t size, int flags)
+ struct dentry *unused, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags)
{
{
- return ocfs2_xattr_set(
d_inode(dentry)
, OCFS2_XATTR_INDEX_SECURITY,
+ return ocfs2_xattr_set(
inode
, OCFS2_XATTR_INDEX_SECURITY,
name, value, size, flags);
}
name, value, size, flags);
}
@@
-7317,18
+7318,19
@@
const struct xattr_handler ocfs2_xattr_security_handler = {
* 'trusted' attributes support
*/
static int ocfs2_xattr_trusted_get(const struct xattr_handler *handler,
* 'trusted' attributes support
*/
static int ocfs2_xattr_trusted_get(const struct xattr_handler *handler,
- struct dentry *
dentry, const char *nam
e,
- void *buffer, size_t size)
+ struct dentry *
unused, struct inode *inod
e,
+
const char *name,
void *buffer, size_t size)
{
{
- return ocfs2_xattr_get(
d_inode(dentry)
, OCFS2_XATTR_INDEX_TRUSTED,
+ return ocfs2_xattr_get(
inode
, OCFS2_XATTR_INDEX_TRUSTED,
name, buffer, size);
}
static int ocfs2_xattr_trusted_set(const struct xattr_handler *handler,
name, buffer, size);
}
static int ocfs2_xattr_trusted_set(const struct xattr_handler *handler,
- struct dentry *dentry, const char *name,
- const void *value, size_t size, int flags)
+ struct dentry *unused, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags)
{
{
- return ocfs2_xattr_set(
d_inode(dentry)
, OCFS2_XATTR_INDEX_TRUSTED,
+ return ocfs2_xattr_set(
inode
, OCFS2_XATTR_INDEX_TRUSTED,
name, value, size, flags);
}
name, value, size, flags);
}
@@
-7342,27
+7344,28
@@
const struct xattr_handler ocfs2_xattr_trusted_handler = {
* 'user' attributes support
*/
static int ocfs2_xattr_user_get(const struct xattr_handler *handler,
* 'user' attributes support
*/
static int ocfs2_xattr_user_get(const struct xattr_handler *handler,
- struct dentry *
dentry, const char *nam
e,
- void *buffer, size_t size)
+ struct dentry *
unused, struct inode *inod
e,
+
const char *name,
void *buffer, size_t size)
{
{
- struct ocfs2_super *osb = OCFS2_SB(
dentry->d
_sb);
+ struct ocfs2_super *osb = OCFS2_SB(
inode->i
_sb);
if (osb->s_mount_opt & OCFS2_MOUNT_NOUSERXATTR)
return -EOPNOTSUPP;
if (osb->s_mount_opt & OCFS2_MOUNT_NOUSERXATTR)
return -EOPNOTSUPP;
- return ocfs2_xattr_get(
d_inode(dentry)
, OCFS2_XATTR_INDEX_USER, name,
+ return ocfs2_xattr_get(
inode
, OCFS2_XATTR_INDEX_USER, name,
buffer, size);
}
static int ocfs2_xattr_user_set(const struct xattr_handler *handler,
buffer, size);
}
static int ocfs2_xattr_user_set(const struct xattr_handler *handler,
- struct dentry *dentry, const char *name,
- const void *value, size_t size, int flags)
+ struct dentry *unused, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags)
{
{
- struct ocfs2_super *osb = OCFS2_SB(
dentry->d
_sb);
+ struct ocfs2_super *osb = OCFS2_SB(
inode->i
_sb);
if (osb->s_mount_opt & OCFS2_MOUNT_NOUSERXATTR)
return -EOPNOTSUPP;
if (osb->s_mount_opt & OCFS2_MOUNT_NOUSERXATTR)
return -EOPNOTSUPP;
- return ocfs2_xattr_set(
d_inode(dentry)
, OCFS2_XATTR_INDEX_USER,
+ return ocfs2_xattr_set(
inode
, OCFS2_XATTR_INDEX_USER,
name, value, size, flags);
}
name, value, size, flags);
}