[Ocfs2-devel] [PATCH 3/4] ocfs2: remove duplicate definition in xattr

[Joel Becker]

On Thu, Oct 23, 2008 at 04:34:13PM +0800, Tiger Yang wrote:
> Include/linux/xattr.h already has the definition about xattr prefix,
> so remove the duplicate definitions in xattr.c.
> 
> Signed-off-by: Tiger Yang <tiger.yang at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>

> ---
>  fs/ocfs2/xattr.c |   11 ++---------
>  1 files changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
> index 667525b..754e5fa 100644
> --- a/fs/ocfs2/xattr.c
> +++ b/fs/ocfs2/xattr.c
> @@ -4830,14 +4830,11 @@ out:
>  /*
>   * 'trusted' attributes support
>   */
> -
> -#define XATTR_TRUSTED_PREFIX "trusted."
> -
>  static size_t ocfs2_xattr_trusted_list(struct inode *inode, char *list,
>  				       size_t list_size, const char *name,
>  				       size_t name_len)
>  {
> -	const size_t prefix_len = sizeof(XATTR_TRUSTED_PREFIX) - 1;
> +	const size_t prefix_len = XATTR_TRUSTED_PREFIX_LEN;
>  	const size_t total_len = prefix_len + name_len + 1;
>  
>  	if (list && total_len <= list_size) {
> @@ -4874,18 +4871,14 @@ struct xattr_handler ocfs2_xattr_trusted_handler = {
>  	.set	= ocfs2_xattr_trusted_set,
>  };
>  
> -
>  /*
>   * 'user' attributes support
>   */
> -
> -#define XATTR_USER_PREFIX "user."
> -
>  static size_t ocfs2_xattr_user_list(struct inode *inode, char *list,
>  				    size_t list_size, const char *name,
>  				    size_t name_len)
>  {
> -	const size_t prefix_len = sizeof(XATTR_USER_PREFIX) - 1;
> +	const size_t prefix_len = XATTR_USER_PREFIX_LEN;
>  	const size_t total_len = prefix_len + name_len + 1;
>  	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
>  
> -- 
> 1.5.4.1
> 

-- 

"If at first you don't succeed, cover all traces that you tried."
                                                        -Unknown

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127