From: Andreas Gruenbacher <agruenba@redhat.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Gruenbacher <agruenba@redhat.com>,
linux-fsdevel@vger.kernel.org,
Tyler Hicks <tyhicks@canonical.com>,
ecryptfs@vger.kernel.org, Miklos Szeredi <miklos@szeredi.hu>,
linux-unionfs@vger.kernel.org,
David Howells <dhowells@redhat.com>,
Serge Hallyn <serge@hallyn.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
linux-ima-devel@lists.sourceforge.net,
Paul Moore <paul@paul-moore.com>,
Stephen Smalley <sds@tycho.nsa.gov>,
Eric Paris <eparis@parisplace.org>,
Casey Schaufler <casey@schaufler-ca.com>,
Oleg Drokin <oleg.drokin@intel.com>,
Andreas Dilger <andreas.dilger@intel.com>
Subject: [PATCH] lustre: Switch to generic xattr handlers
Date: Tue, 23 Aug 2016 11:57:13 +0200 [thread overview]
Message-ID: <1471946233-6846-1-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1471900928-21588-1-git-send-email-agruenba@redhat.com>
This was still missing from the "xattr inode operation removal" patch queue.
I've updated the git tree as well:
https://git.kernel.org/cgit/linux/kernel/git/agruen/linux.git/log/?h=work.xattr
Thanks,
Andreas
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
drivers/staging/lustre/lustre/llite/file.c | 3 --
.../staging/lustre/lustre/llite/llite_internal.h | 7 ++--
drivers/staging/lustre/lustre/llite/llite_lib.c | 1 +
drivers/staging/lustre/lustre/llite/namei.c | 6 ----
drivers/staging/lustre/lustre/llite/symlink.c | 3 --
drivers/staging/lustre/lustre/llite/xattr.c | 42 +++++++++++++++++++---
6 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index 57281b9..e8c81e8 100644
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -3213,10 +3213,7 @@ const struct inode_operations ll_file_inode_operations = {
.setattr = ll_setattr,
.getattr = ll_getattr,
.permission = ll_inode_permission,
- .setxattr = ll_setxattr,
- .getxattr = ll_getxattr,
.listxattr = ll_listxattr,
- .removexattr = ll_removexattr,
.fiemap = ll_fiemap,
.get_acl = ll_get_acl,
};
diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index 4d6d589..8695aca 100644
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -933,12 +933,9 @@ static inline __u64 ll_file_maxbytes(struct inode *inode)
}
/* llite/xattr.c */
-int ll_setxattr(struct dentry *dentry, struct inode *inode,
- const char *name, const void *value, size_t size, int flags);
-ssize_t ll_getxattr(struct dentry *dentry, struct inode *inode,
- const char *name, void *buffer, size_t size);
+struct xattr_handler;
+extern const struct xattr_handler *lustre_xattr_handlers[];
ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size);
-int ll_removexattr(struct dentry *dentry, const char *name);
/**
* Common IO arguments for various VFS I/O interfaces.
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index 546063e..81f4fe9 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -421,6 +421,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
#if THREAD_SIZE >= 8192 /*b=17630*/
sb->s_export_op = &lustre_export_operations;
#endif
+ sb->s_xattr = lustre_xattr_handlers;
/* make root inode
* XXX: move this to after cbd setup?
diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 3664bfd..53467b2 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -1101,10 +1101,7 @@ const struct inode_operations ll_dir_inode_operations = {
.setattr = ll_setattr,
.getattr = ll_getattr,
.permission = ll_inode_permission,
- .setxattr = ll_setxattr,
- .getxattr = ll_getxattr,
.listxattr = ll_listxattr,
- .removexattr = ll_removexattr,
.get_acl = ll_get_acl,
};
@@ -1112,9 +1109,6 @@ const struct inode_operations ll_special_inode_operations = {
.setattr = ll_setattr,
.getattr = ll_getattr,
.permission = ll_inode_permission,
- .setxattr = ll_setxattr,
- .getxattr = ll_getxattr,
.listxattr = ll_listxattr,
- .removexattr = ll_removexattr,
.get_acl = ll_get_acl,
};
diff --git a/drivers/staging/lustre/lustre/llite/symlink.c b/drivers/staging/lustre/lustre/llite/symlink.c
index 8c8bdfe..d82dab2 100644
--- a/drivers/staging/lustre/lustre/llite/symlink.c
+++ b/drivers/staging/lustre/lustre/llite/symlink.c
@@ -155,8 +155,5 @@ const struct inode_operations ll_fast_symlink_inode_operations = {
.get_link = ll_get_link,
.getattr = ll_getattr,
.permission = ll_inode_permission,
- .setxattr = ll_setxattr,
- .getxattr = ll_getxattr,
.listxattr = ll_listxattr,
- .removexattr = ll_removexattr,
};
diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index 98303cf..f43f523 100644
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -34,6 +34,7 @@
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/selinux.h>
+#include <linux/xattr.h>
#define DEBUG_SUBSYSTEM S_LLITE
@@ -149,8 +150,9 @@ int ll_setxattr_common(struct inode *inode, const char *name,
return 0;
}
-int ll_setxattr(struct dentry *dentry, struct inode *inode,
- const char *name, const void *value, size_t size, int flags)
+static int ll_setxattr(struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value, size_t size,
+ int flags)
{
LASSERT(inode);
LASSERT(name);
@@ -202,7 +204,7 @@ int ll_setxattr(struct dentry *dentry, struct inode *inode,
OBD_MD_FLXATTR);
}
-int ll_removexattr(struct dentry *dentry, const char *name)
+static int ll_removexattr(struct dentry *dentry, const char *name)
{
struct inode *inode = d_inode(dentry);
@@ -351,8 +353,8 @@ out:
return rc;
}
-ssize_t ll_getxattr(struct dentry *dentry, struct inode *inode,
- const char *name, void *buffer, size_t size)
+static ssize_t ll_getxattr(struct dentry *dentry, struct inode *inode,
+ const char *name, void *buffer, size_t size)
{
LASSERT(inode);
LASSERT(name);
@@ -518,3 +520,33 @@ out:
return rc;
}
+
+static int lustre_xattr_get(const struct xattr_handler *handler,
+ struct dentry *dentry, struct inode *inode,
+ const char *name, void *buffer, size_t size)
+{
+ return ll_getxattr(dentry, inode, name, buffer, size);
+}
+
+static int lustre_xattr_set(const struct xattr_handler *handler,
+ struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value, size_t size,
+ int flags)
+{
+ if (!value) {
+ BUG_ON(flags != XATTR_REPLACE);
+ return ll_removexattr(dentry, name);
+ }
+ return ll_setxattr(dentry, inode, name, value, size, flags);
+}
+
+const struct xattr_handler lustre_xattr_handler = {
+ .prefix = "", /* match anything */
+ .get = lustre_xattr_get,
+ .set = lustre_xattr_set,
+};
+
+const struct xattr_handler *lustre_xattr_handlers[] = {
+ &lustre_xattr_handler,
+ NULL
+};
--
2.7.4
prev parent reply other threads:[~2016-08-23 9:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-22 21:21 [PATCH v4 00/20] Xattr inode operation removal Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 01/20] ovl: Fix OVL_XATTR_PREFIX Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 02/20] ovl: Get rid of ovl_xattr_noacl_handlers array Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 03/20] ovl: Switch to generic_removexattr Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 04/20] ovl: Switch to generic_getxattr Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 05/20] xattr: Remove unnecessary NULL attribute name check Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 06/20] jffs2: Remove jffs2_{get,set,remove}xattr macros Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 07/20] hfs: Switch to generic xattr handlers Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 08/20] kernfs: " Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 09/20] sockfs: getxattr: Fail with -EOPNOTSUPP for invalid attribute names Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 10/20] sockfs: Get rid of getxattr iop Andreas Gruenbacher
2016-08-22 21:21 ` [PATCH v4 11/20] ecryptfs: Switch to generic xattr handlers Andreas Gruenbacher
2016-08-22 21:22 ` [PATCH v4 12/20] fuse: " Andreas Gruenbacher
2016-08-22 21:22 ` [PATCH v4 13/20] vfs: Move xattr_resolve_name to the front of fs/xattr.c Andreas Gruenbacher
2016-08-22 21:22 ` [PATCH v4 14/20] vfs: Add IOP_XATTR inode operations flag Andreas Gruenbacher
2016-08-22 21:22 ` [PATCH v4 15/20] vfs: Use IOP_XATTR flag for bad-inode handling Andreas Gruenbacher
2016-08-22 21:22 ` [PATCH v4 16/20] libfs: Use IOP_XATTR flag for empty directory handling Andreas Gruenbacher
2016-08-22 21:22 ` [PATCH v4 17/20] xattr: Add __vfs_{get,set,remove}xattr helpers Andreas Gruenbacher
2016-08-22 21:22 ` [PATCH v4 18/20] vfs: Check for the IOP_XATTR flag in listxattr Andreas Gruenbacher
2016-08-22 21:22 ` [PATCH v4 19/20] xattr: Stop calling {get,set,remove}xattr inode operations Andreas Gruenbacher
2016-08-22 21:22 ` [PATCH v4 20/20] vfs: Remove " Andreas Gruenbacher
2016-08-23 0:34 ` kbuild test robot
2016-08-23 9:57 ` Andreas Gruenbacher [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1471946233-6846-1-git-send-email-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=andreas.dilger@intel.com \
--cc=casey@schaufler-ca.com \
--cc=dhowells@redhat.com \
--cc=dmitry.kasatkin@gmail.com \
--cc=ecryptfs@vger.kernel.org \
--cc=eparis@parisplace.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-ima-devel@lists.sourceforge.net \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=oleg.drokin@intel.com \
--cc=paul@paul-moore.com \
--cc=sds@tycho.nsa.gov \
--cc=serge@hallyn.com \
--cc=tyhicks@canonical.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).