Hi Andreas...
I've looked over your patch series, and was about
to apply it and run some tests... but the first patch
"orangefs: Remove useless defines" won't apply.
I received your patch series a day or so after I merged
our kernel.org tree up to 4.6, and at first I thought maybe
you'd composed your patch during the long spell when
the last commit in our tree was e56f49814250f4ca4b66ec7d3a71152846761d1b,
resulting in some kind of conflict, but that's not it. Now
that we're upstream, you're probably patching against
the "real" Linux tree anyhow...
Here's where the fail happens:
@@ -470,7 +470,7 @@ static int orangefs_xattr_get_default(const struct
xattr_handler *handler,
size_t size)
{
return orangefs_inode_getxattr(inode,
- ORANGEFS_XATTR_NAME_DEFAULT_PREFIX,
+ "",
name,
buffer,
size);
"return orangefs_inode_getxattr(inode," should be
"return orangefs_inode_getxattr(dentry->d_inode,"
I looked way back in time, and don't think it ever
was "inode" instead of "dentry->d_inode", or how
it could ever be.
I'm confused.
-Mike "again <g> "
On Wed, May 25, 2016 at 6:29 AM, Andreas Gruenbacher
<agruenba@xxxxxxxxxx> wrote:
> The ORANGEFS_XATTR_INDEX_ defines are unused; the ORANGEFS_XATTR_NAME_
> defines only obfuscate the code.
>
> Signed-off-by: Andreas Gruenbacher <agruenba@xxxxxxxxxx>
> ---
> fs/orangefs/acl.c | 8 ++++----
> fs/orangefs/file.c | 4 ++--
> fs/orangefs/orangefs-kernel.h | 11 -----------
> fs/orangefs/xattr.c | 17 ++++++-----------
> 4 files changed, 12 insertions(+), 28 deletions(-)
>
> diff --git a/fs/orangefs/acl.c b/fs/orangefs/acl.c
> index 03f89db..df24864 100644
> --- a/fs/orangefs/acl.c
> +++ b/fs/orangefs/acl.c
> @@ -18,10 +18,10 @@ struct posix_acl *orangefs_get_acl(struct inode *inode, int type)
>
> switch (type) {
> case ACL_TYPE_ACCESS:
> - key = ORANGEFS_XATTR_NAME_ACL_ACCESS;
> + key = XATTR_NAME_POSIX_ACL_ACCESS;
> break;
> case ACL_TYPE_DEFAULT:
> - key = ORANGEFS_XATTR_NAME_ACL_DEFAULT;
> + key = XATTR_NAME_POSIX_ACL_DEFAULT;
> break;
> default:
> gossip_err("orangefs_get_acl: bogus value of type %d\n", type);
> @@ -74,7 +74,7 @@ int orangefs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
>
> switch (type) {
> case ACL_TYPE_ACCESS:
> - name = ORANGEFS_XATTR_NAME_ACL_ACCESS;
> + name = XATTR_NAME_POSIX_ACL_ACCESS;
> if (acl) {
> umode_t mode = inode->i_mode;
> /*
> @@ -98,7 +98,7 @@ int orangefs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
> }
> break;
> case ACL_TYPE_DEFAULT:
> - name = ORANGEFS_XATTR_NAME_ACL_DEFAULT;
> + name = XATTR_NAME_POSIX_ACL_DEFAULT;
> break;
> default:
> gossip_err("%s: invalid type %d!\n", __func__, type);
> diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
> index 491e82c..5160a3f 100644
> --- a/fs/orangefs/file.c
> +++ b/fs/orangefs/file.c
> @@ -516,7 +516,7 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long ar
> if (cmd == FS_IOC_GETFLAGS) {
> val = 0;
> ret = orangefs_inode_getxattr(file_inode(file),
> - ORANGEFS_XATTR_NAME_DEFAULT_PREFIX,
> + "",
> "user.pvfs2.meta_hint",
> &val, sizeof(val));
> if (ret < 0 && ret != -ENODATA)
> @@ -549,7 +549,7 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long ar
> "orangefs_ioctl: FS_IOC_SETFLAGS: %llu\n",
> (unsigned long long)val);
> ret = orangefs_inode_setxattr(file_inode(file),
> - ORANGEFS_XATTR_NAME_DEFAULT_PREFIX,
> + "",
> "user.pvfs2.meta_hint",
> &val, sizeof(val), 0);
> }
> diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
> index 2281882..6503e37 100644
> --- a/fs/orangefs/orangefs-kernel.h
> +++ b/fs/orangefs/orangefs-kernel.h
> @@ -119,17 +119,6 @@ struct client_debug_mask {
> #define ORANGEFS_CACHE_CREATE_FLAGS 0
> #endif /* ((defined ORANGEFS_KERNEL_DEBUG) && (defined CONFIG_DEBUG_SLAB)) */
>
> -/* orangefs xattr and acl related defines */
> -#define ORANGEFS_XATTR_INDEX_POSIX_ACL_ACCESS 1
> -#define ORANGEFS_XATTR_INDEX_POSIX_ACL_DEFAULT 2
> -#define ORANGEFS_XATTR_INDEX_TRUSTED 3
> -#define ORANGEFS_XATTR_INDEX_DEFAULT 4
> -
> -#define ORANGEFS_XATTR_NAME_ACL_ACCESS XATTR_NAME_POSIX_ACL_ACCESS
> -#define ORANGEFS_XATTR_NAME_ACL_DEFAULT XATTR_NAME_POSIX_ACL_DEFAULT
> -#define ORANGEFS_XATTR_NAME_TRUSTED_PREFIX "trusted."
> -#define ORANGEFS_XATTR_NAME_DEFAULT_PREFIX ""
> -
> /* these functions are defined in orangefs-utils.c */
> int orangefs_prepare_cdm_array(char *debug_array_string);
> int orangefs_prepare_debugfs_help_string(int);
> diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c
> index 99c1954..2944d0a 100644
> --- a/fs/orangefs/xattr.c
> +++ b/fs/orangefs/xattr.c
> @@ -455,7 +455,7 @@ static int orangefs_xattr_set_default(const struct xattr_handler *handler,
> int flags)
> {
> return orangefs_inode_setxattr(dentry->d_inode,
> - ORANGEFS_XATTR_NAME_DEFAULT_PREFIX,
> + "",
> name,
> buffer,
> size,
> @@ -470,7 +470,7 @@ static int orangefs_xattr_get_default(const struct xattr_handler *handler,
> size_t size)
> {
> return orangefs_inode_getxattr(inode,
> - ORANGEFS_XATTR_NAME_DEFAULT_PREFIX,
> + "",
> name,
> buffer,
> size);
> @@ -485,7 +485,7 @@ static int orangefs_xattr_set_trusted(const struct xattr_handler *handler,
> int flags)
> {
> return orangefs_inode_setxattr(dentry->d_inode,
> - ORANGEFS_XATTR_NAME_TRUSTED_PREFIX,
> + XATTR_TRUSTED_PREFIX,
> name,
> buffer,
> size,
> @@ -500,25 +500,20 @@ static int orangefs_xattr_get_trusted(const struct xattr_handler *handler,
> size_t size)
> {
> return orangefs_inode_getxattr(inode,
> - ORANGEFS_XATTR_NAME_TRUSTED_PREFIX,
> + XATTR_TRUSTED_PREFIX,
> name,
> buffer,
> size);
> }
>
> static struct xattr_handler orangefs_xattr_trusted_handler = {
> - .prefix = ORANGEFS_XATTR_NAME_TRUSTED_PREFIX,
> + .prefix = XATTR_TRUSTED_PREFIX,
> .get = orangefs_xattr_get_trusted,
> .set = orangefs_xattr_set_trusted,
> };
>
> static struct xattr_handler orangefs_xattr_default_handler = {
> - /*
> - * NOTE: this is set to be the empty string.
> - * so that all un-prefixed xattrs keys get caught
> - * here!
> - */
> - .prefix = ORANGEFS_XATTR_NAME_DEFAULT_PREFIX,
> + .prefix = "", /* match any name => handlers called with full name */
> .get = orangefs_xattr_get_default,
> .set = orangefs_xattr_set_default,
> };
> --
> 2.5.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
