git.samba.org
/
sfrench
/
cifs-2.6.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/viro/vfs
[sfrench/cifs-2.6.git]
/
fs
/
btrfs
/
xattr.c
diff --git
a/fs/btrfs/xattr.c
b/fs/btrfs/xattr.c
index 45ea704be0309d34bbad4542df2a31b960acd361..6f518c90e1c14b6966d80ab9202c0bff0e399686 100644
(file)
--- a/
fs/btrfs/xattr.c
+++ b/
fs/btrfs/xattr.c
@@
-261,7
+261,7
@@
out:
ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
{
struct btrfs_key key, found_key;
ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
{
struct btrfs_key key, found_key;
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
struct btrfs_root *root = BTRFS_I(inode)->root;
struct btrfs_path *path;
struct extent_buffer *leaf;
struct btrfs_root *root = BTRFS_I(inode)->root;
struct btrfs_path *path;
struct extent_buffer *leaf;
@@
-411,13
+411,13
@@
ssize_t btrfs_getxattr(struct dentry *dentry, const char *name,
ret = btrfs_is_valid_xattr(name);
if (ret)
return ret;
ret = btrfs_is_valid_xattr(name);
if (ret)
return ret;
- return __btrfs_getxattr(d
entry->d_inode
, name, buffer, size);
+ return __btrfs_getxattr(d
_inode(dentry)
, name, buffer, size);
}
int btrfs_setxattr(struct dentry *dentry, const char *name, const void *value,
size_t size, int flags)
{
}
int btrfs_setxattr(struct dentry *dentry, const char *name, const void *value,
size_t size, int flags)
{
- struct btrfs_root *root = BTRFS_I(d
entry->d_inode
)->root;
+ struct btrfs_root *root = BTRFS_I(d
_inode(dentry)
)->root;
int ret;
/*
int ret;
/*
@@
-440,19
+440,19
@@
int btrfs_setxattr(struct dentry *dentry, const char *name, const void *value,
return ret;
if (!strncmp(name, XATTR_BTRFS_PREFIX, XATTR_BTRFS_PREFIX_LEN))
return ret;
if (!strncmp(name, XATTR_BTRFS_PREFIX, XATTR_BTRFS_PREFIX_LEN))
- return btrfs_set_prop(d
entry->d_inode
, name,
+ return btrfs_set_prop(d
_inode(dentry)
, name,
value, size, flags);
if (size == 0)
value = ""; /* empty EA, do not remove */
value, size, flags);
if (size == 0)
value = ""; /* empty EA, do not remove */
- return __btrfs_setxattr(NULL, d
entry->d_inode
, name, value, size,
+ return __btrfs_setxattr(NULL, d
_inode(dentry)
, name, value, size,
flags);
}
int btrfs_removexattr(struct dentry *dentry, const char *name)
{
flags);
}
int btrfs_removexattr(struct dentry *dentry, const char *name)
{
- struct btrfs_root *root = BTRFS_I(d
entry->d_inode
)->root;
+ struct btrfs_root *root = BTRFS_I(d
_inode(dentry)
)->root;
int ret;
/*
int ret;
/*
@@
-475,10
+475,10
@@
int btrfs_removexattr(struct dentry *dentry, const char *name)
return ret;
if (!strncmp(name, XATTR_BTRFS_PREFIX, XATTR_BTRFS_PREFIX_LEN))
return ret;
if (!strncmp(name, XATTR_BTRFS_PREFIX, XATTR_BTRFS_PREFIX_LEN))
- return btrfs_set_prop(d
entry->d_inode
, name,
+ return btrfs_set_prop(d
_inode(dentry)
, name,
NULL, 0, XATTR_REPLACE);
NULL, 0, XATTR_REPLACE);
- return __btrfs_setxattr(NULL, d
entry->d_inode
, name, NULL, 0,
+ return __btrfs_setxattr(NULL, d
_inode(dentry)
, name, NULL, 0,
XATTR_REPLACE);
}
XATTR_REPLACE);
}