diff options
| author |   Mark Brown <broonie@kernel.org> | 2016-02-22 20:12:13 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-22 20:12:13 +0900 |
| commit | 8174b35f1d9b54b740a935410c7b3891e3e2a119 (patch) | |
| tree | 95427a4dd7248c41547a9a8d4afcfe7aa9a3a9fd /fs/kernfs/inode.c | |
| parent | ASoC: mediatek: Enable 33bit memory address to support 4GB DRAM (diff) | |
| parent | Linux 4.5-rc5 (diff) | |
| download | wireguard-linux-8174b35f1d9b54b740a935410c7b3891e3e2a119.tar.xz wireguard-linux-8174b35f1d9b54b740a935410c7b3891e3e2a119.zip | |
Merge tag 'v4.5-rc5' into asoc-mtk
Linux 4.5-rc5
Diffstat (limited to 'fs/kernfs/inode.c')
| -rw-r--r-- | fs/kernfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c index 756dd56aaf60..16405ae88d2d 100644 --- a/fs/kernfs/inode.c +++ b/fs/kernfs/inode.c @@ -205,7 +205,7 @@ int kernfs_iop_removexattr(struct dentry *dentry, const char *name) if (!attrs) return -ENOMEM; - return simple_xattr_remove(&attrs->xattrs, name); + return simple_xattr_set(&attrs->xattrs, name, NULL, 0, XATTR_REPLACE); } ssize_t kernfs_iop_getxattr(struct dentry *dentry, const char *name, void *buf, @@ -230,7 +230,7 @@ ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size) if (!attrs) return -ENOMEM; - return simple_xattr_list(&attrs->xattrs, buf, size); + return simple_xattr_list(d_inode(dentry), &attrs->xattrs, buf, size); } static inline void set_default_inode_attr(struct inode *inode, umode_t mode) |