diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2016-09-29 17:48:39 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-07 20:10:42 -0400 |
| commit | d0a5b995a308347fdb1bb0412df32acd0312523b (patch) | |
| tree | 080efa7c4513aa0e42e9e65c75260546f9b303ac /fs | |
| parent | b6ba11773d9535fbe068232f2231c99740bb32db (diff) | |
vfs: Add IOP_XATTR inode operations flag
The IOP_XATTR inode operations flag in inode->i_opflags indicates that
the inode has xattr support. The flag is automatically set by
new_inode() on filesystems with xattr support (where sb->s_xattr is
defined), and cleared otherwise. Filesystems can explicitly clear it
for inodes that should not have xattr support.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/inode.c | 2 | ||||
| -rw-r--r-- | fs/xattr.c | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/fs/inode.c b/fs/inode.c index 7e3ef3af3db9..705f8609fdb8 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -140,6 +140,8 @@ int inode_init_always(struct super_block *sb, struct inode *inode) inode->i_fop = &no_open_fops; inode->__i_nlink = 1; inode->i_opflags = 0; + if (sb->s_xattr) + inode->i_opflags |= IOP_XATTR; i_uid_write(inode, 0); i_gid_write(inode, 0); atomic_set(&inode->i_writecount, 0); diff --git a/fs/xattr.c b/fs/xattr.c index bb3cbbfd982d..38b52a356d1b 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -53,10 +53,13 @@ strcmp_prefix(const char *a, const char *a_prefix) * Find the xattr_handler with the matching prefix. */ static const struct xattr_handler * -xattr_resolve_name(const struct xattr_handler **handlers, const char **name) +xattr_resolve_name(struct inode *inode, const char **name) { + const struct xattr_handler **handlers = inode->i_sb->s_xattr; const struct xattr_handler *handler; + if (!(inode->i_opflags & IOP_XATTR)) + return ERR_PTR(-EOPNOTSUPP); for_each_xattr_handler(handlers, handler) { const char *n; @@ -298,6 +301,7 @@ nolsm: error = -EOPNOTSUPP; return error; + } EXPORT_SYMBOL_GPL(vfs_getxattr); @@ -700,7 +704,7 @@ generic_getxattr(struct dentry *dentry, struct inode *inode, { const struct xattr_handler *handler; - handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name); + handler = xattr_resolve_name(inode, &name); if (IS_ERR(handler)) return PTR_ERR(handler); return handler->get(handler, dentry, inode, @@ -755,7 +759,7 @@ generic_setxattr(struct dentry *dentry, struct inode *inode, const char *name, if (size == 0) value = ""; /* empty EA, do not remove */ - handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name); + handler = xattr_resolve_name(inode, &name); if (IS_ERR(handler)) return PTR_ERR(handler); return handler->set(handler, dentry, inode, name, value, size, flags); @@ -770,7 +774,7 @@ generic_removexattr(struct dentry *dentry, const char *name) { const struct xattr_handler *handler; - handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name); + handler = xattr_resolve_name(d_inode(dentry), &name); if (IS_ERR(handler)) return PTR_ERR(handler); return handler->set(handler, dentry, d_inode(dentry), name, NULL, |