projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ext4
/
xattr.c
diff --git
a/fs/ext4/xattr.c
b/fs/ext4/xattr.c
index 759842ff8af050be473ce3cab3b754d7f413a67d..16e28c08d1e8cf54eb0c05d15611a6416185b119 100644
(file)
--- a/
fs/ext4/xattr.c
+++ b/
fs/ext4/xattr.c
@@
-178,7
+178,7
@@
ext4_xattr_handler(int name_index)
/*
* Inode operation listxattr()
*
/*
* Inode operation listxattr()
*
- * d
entry->d_inode
->i_mutex: don't care
+ * d
_inode(dentry)
->i_mutex: don't care
*/
ssize_t
ext4_listxattr(struct dentry *dentry, char *buffer, size_t size)
*/
ssize_t
ext4_listxattr(struct dentry *dentry, char *buffer, size_t size)
@@
-423,7
+423,7
@@
ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
static int
ext4_xattr_block_list(struct dentry *dentry, char *buffer, size_t buffer_size)
{
static int
ext4_xattr_block_list(struct dentry *dentry, char *buffer, size_t buffer_size)
{
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
struct buffer_head *bh = NULL;
int error;
struct mb_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode);
struct buffer_head *bh = NULL;
int error;
struct mb_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode);
@@
-460,7
+460,7
@@
cleanup:
static int
ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size)
{
static int
ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size)
{
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
struct ext4_xattr_ibody_header *header;
struct ext4_inode *raw_inode;
struct ext4_iloc iloc;
struct ext4_xattr_ibody_header *header;
struct ext4_inode *raw_inode;
struct ext4_iloc iloc;
@@
-501,7
+501,7
@@
ext4_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
{
int ret, ret2;
{
int ret, ret2;
- down_read(&EXT4_I(d
entry->d_inode
)->xattr_sem);
+ down_read(&EXT4_I(d
_inode(dentry)
)->xattr_sem);
ret = ret2 = ext4_xattr_ibody_list(dentry, buffer, buffer_size);
if (ret < 0)
goto errout;
ret = ret2 = ext4_xattr_ibody_list(dentry, buffer, buffer_size);
if (ret < 0)
goto errout;
@@
-514,7
+514,7
@@
ext4_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
goto errout;
ret += ret2;
errout:
goto errout;
ret += ret2;
errout:
- up_read(&EXT4_I(d
entry->d_inode
)->xattr_sem);
+ up_read(&EXT4_I(d
_inode(dentry)
)->xattr_sem);
return ret;
}
return ret;
}