* [PATCH] ext4: remove double definitions of xattr macros
@ 2008-05-23 9:28 Shen Feng
2008-05-28 21:19 ` Mingming Cao
0 siblings, 1 reply; 3+ messages in thread
From: Shen Feng @ 2008-05-23 9:28 UTC (permalink / raw)
To: linux-ext4, Andrew Morton
remove the definitions of macros:
XATTR_TRUSTED_PREFIX
XATTR_USER_PREFIX
since they are defined in linux/xattr.h
Signed-off-by: Shen Feng <shen@cn.fujitsu.com>
---
fs/ext4/xattr_trusted.c | 4 +---
fs/ext4/xattr_user.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fs/ext4/xattr_trusted.c b/fs/ext4/xattr_trusted.c
index fff3338..ac1a52c 100644
--- a/fs/ext4/xattr_trusted.c
+++ b/fs/ext4/xattr_trusted.c
@@ -13,13 +13,11 @@
#include "ext4.h"
#include "xattr.h"
-#define XATTR_TRUSTED_PREFIX "trusted."
-
static size_t
ext4_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 (!capable(CAP_SYS_ADMIN))
diff --git a/fs/ext4/xattr_user.c b/fs/ext4/xattr_user.c
index 67be723..d91aa61 100644
--- a/fs/ext4/xattr_user.c
+++ b/fs/ext4/xattr_user.c
@@ -12,13 +12,11 @@
#include "ext4.h"
#include "xattr.h"
-#define XATTR_USER_PREFIX "user."
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ext4: remove double definitions of xattr macros
2008-05-23 9:28 [PATCH] ext4: remove double definitions of xattr macros Shen Feng
@ 2008-05-28 21:19 ` Mingming Cao
2008-05-29 2:06 ` Shen Feng
0 siblings, 1 reply; 3+ messages in thread
From: Mingming Cao @ 2008-05-28 21:19 UTC (permalink / raw)
To: Shen Feng; +Cc: linux-ext4, Andrew Morton
On Fri, 2008-05-23 at 17:28 +0800, Shen Feng wrote:
> remove the definitions of macros:
> XATTR_TRUSTED_PREFIX
> XATTR_USER_PREFIX
> since they are defined in linux/xattr.h
>
> Signed-off-by: Shen Feng <shen@cn.fujitsu.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
BTW, the similar duplication also appear in in ext2/3/reiserfs, clean up
should also done there too?
> ---
> fs/ext4/xattr_trusted.c | 4 +---
> fs/ext4/xattr_user.c | 4 +---
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/fs/ext4/xattr_trusted.c b/fs/ext4/xattr_trusted.c
> index fff3338..ac1a52c 100644
> --- a/fs/ext4/xattr_trusted.c
> +++ b/fs/ext4/xattr_trusted.c
> @@ -13,13 +13,11 @@
> #include "ext4.h"
> #include "xattr.h"
>
> -#define XATTR_TRUSTED_PREFIX "trusted."
> -
> static size_t
> ext4_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 (!capable(CAP_SYS_ADMIN))
> diff --git a/fs/ext4/xattr_user.c b/fs/ext4/xattr_user.c
> index 67be723..d91aa61 100644
> --- a/fs/ext4/xattr_user.c
> +++ b/fs/ext4/xattr_user.c
> @@ -12,13 +12,11 @@
> #include "ext4.h"
> #include "xattr.h"
>
> -#define XATTR_USER_PREFIX "user."
> -
> static size_t
> ext4_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;
>
> if (!test_opt(inode->i_sb, XATTR_USER))
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ext4: remove double definitions of xattr macros
2008-05-28 21:19 ` Mingming Cao
@ 2008-05-29 2:06 ` Shen Feng
0 siblings, 0 replies; 3+ messages in thread
From: Shen Feng @ 2008-05-29 2:06 UTC (permalink / raw)
To: cmm; +Cc: linux-ext4, Andrew Morton
Mingming Cao Wrote:
> On Fri, 2008-05-23 at 17:28 +0800, Shen Feng wrote:
>> remove the definitions of macros:
>> XATTR_TRUSTED_PREFIX
>> XATTR_USER_PREFIX
>> since they are defined in linux/xattr.h
>>
>> Signed-off-by: Shen Feng <shen@cn.fujitsu.com>
>
> Signed-off-by: Mingming Cao <cmm@us.ibm.com>
>
> BTW, the similar duplication also appear in in ext2/3/reiserfs, clean up
> should also done there too?
Yes. I will send a patch series to fix this.
>
>> ---
>> fs/ext4/xattr_trusted.c | 4 +---
>> fs/ext4/xattr_user.c | 4 +---
>> 2 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/fs/ext4/xattr_trusted.c b/fs/ext4/xattr_trusted.c
>> index fff3338..ac1a52c 100644
>> --- a/fs/ext4/xattr_trusted.c
>> +++ b/fs/ext4/xattr_trusted.c
>> @@ -13,13 +13,11 @@
>> #include "ext4.h"
>> #include "xattr.h"
>>
>> -#define XATTR_TRUSTED_PREFIX "trusted."
>> -
>> static size_t
>> ext4_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 (!capable(CAP_SYS_ADMIN))
>> diff --git a/fs/ext4/xattr_user.c b/fs/ext4/xattr_user.c
>> index 67be723..d91aa61 100644
>> --- a/fs/ext4/xattr_user.c
>> +++ b/fs/ext4/xattr_user.c
>> @@ -12,13 +12,11 @@
>> #include "ext4.h"
>> #include "xattr.h"
>>
>> -#define XATTR_USER_PREFIX "user."
>> -
>> static size_t
>> ext4_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;
>>
>> if (!test_opt(inode->i_sb, XATTR_USER))
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-05-29 2:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-23 9:28 [PATCH] ext4: remove double definitions of xattr macros Shen Feng
2008-05-28 21:19 ` Mingming Cao
2008-05-29 2:06 ` Shen Feng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox