* [PATCH] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2012-12-28 4:31 Chen Gang
2012-12-31 15:45 ` Jan Kara
2013-01-04 3:04 ` [PATCH v2] " Chen Gang
0 siblings, 2 replies; 23+ messages in thread
From: Chen Gang @ 2012-12-28 4:31 UTC (permalink / raw)
To: jack, akpm, adilger.kernel, Theodore Ts'o, jaegeuk.kim,
dwmw2, torvalds, linux-ext4, linux-f2fs-devel, linux-mtd,
reiserfs-devel
give comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
[1] Where * is the regexp sense of "0 or more times"
[2] Only if there is at least one ACL_USER or ACL_GROUP tag;
otherwise skip ACL_MASK.
use macro instead of hard code number (by Chen Gang)
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
fs/ext2/acl.h | 10 +++++-----
fs/ext3/acl.h | 10 +++++-----
fs/ext4/acl.h | 10 +++++-----
fs/f2fs/acl.c | 12 +++++++-----
fs/jffs2/acl.c | 15 +++++++++------
fs/reiserfs/acl.h | 10 +++++-----
include/linux/posix_acl.h | 9 +++++++++
7 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
index 503bfb0..9af79d0 100644
--- a/fs/ext2/acl.h
+++ b/fs/ext2/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext2_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext2_acl_header) +
count * sizeof(ext2_acl_entry_short);
} else {
return sizeof(ext2_acl_header) +
- 4 * sizeof(ext2_acl_entry_short) +
- (count - 4) * sizeof(ext2_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext2_acl_header);
- s = size - 4 * sizeof(ext2_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext2_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
} else {
if (s % sizeof(ext2_acl_entry))
return -1;
- return s / sizeof(ext2_acl_entry) + 4;
+ return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
index dbc921e..b1cf2c0 100644
--- a/fs/ext3/acl.h
+++ b/fs/ext3/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext3_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext3_acl_header) +
count * sizeof(ext3_acl_entry_short);
} else {
return sizeof(ext3_acl_header) +
- 4 * sizeof(ext3_acl_entry_short) +
- (count - 4) * sizeof(ext3_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext3_acl_header);
- s = size - 4 * sizeof(ext3_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext3_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
} else {
if (s % sizeof(ext3_acl_entry))
return -1;
- return s / sizeof(ext3_acl_entry) + 4;
+ return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index 18cb39e..66d1fa3 100644
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext4_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext4_acl_header) +
count * sizeof(ext4_acl_entry_short);
} else {
return sizeof(ext4_acl_header) +
- 4 * sizeof(ext4_acl_entry_short) +
- (count - 4) * sizeof(ext4_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext4_acl_header);
- s = size - 4 * sizeof(ext4_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext4_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
} else {
if (s % sizeof(ext4_acl_entry))
return -1;
- return s / sizeof(ext4_acl_entry) + 4;
+ return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index fed74d1..42e0070 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -22,13 +22,15 @@
static inline size_t f2fs_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(struct f2fs_acl_header) +
count * sizeof(struct f2fs_acl_entry_short);
} else {
return sizeof(struct f2fs_acl_header) +
- 4 * sizeof(struct f2fs_acl_entry_short) +
- (count - 4) * sizeof(struct f2fs_acl_entry);
+ ACL_MAX_SHORT_ENTRY
+ * sizeof(struct f2fs_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY)
+ * sizeof(struct f2fs_acl_entry);
}
}
@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(struct f2fs_acl_header);
- s = size - 4 * sizeof(struct f2fs_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
if (s < 0) {
if (size % sizeof(struct f2fs_acl_entry_short))
return -1;
@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
} else {
if (s % sizeof(struct f2fs_acl_entry))
return -1;
- return s / sizeof(struct f2fs_acl_entry) + 4;
+ return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 223283c..48ef4b8 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -25,13 +25,15 @@
static size_t jffs2_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(struct jffs2_acl_header)
+ count * sizeof(struct jffs2_acl_entry_short);
} else {
return sizeof(struct jffs2_acl_header)
- + 4 * sizeof(struct jffs2_acl_entry_short)
- + (count - 4) * sizeof(struct jffs2_acl_entry);
+ + ACL_MAX_SHORT_ENTRY
+ * sizeof(struct jffs2_acl_entry_short)
+ + (count - ACL_MAX_SHORT_ENTRY)
+ * sizeof(struct jffs2_acl_entry);
}
}
@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
size_t s;
size -= sizeof(struct jffs2_acl_header);
- if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
+ if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
if (size % sizeof(struct jffs2_acl_entry_short))
return -1;
return size / sizeof(struct jffs2_acl_entry_short);
} else {
- s = size - 4 * sizeof(struct jffs2_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY
+ * sizeof(struct jffs2_acl_entry_short);
if (s % sizeof(struct jffs2_acl_entry))
return -1;
- return s / sizeof(struct jffs2_acl_entry) + 4;
+ return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
index f096b80..cb967a3 100644
--- a/fs/reiserfs/acl.h
+++ b/fs/reiserfs/acl.h
@@ -20,13 +20,13 @@ typedef struct {
static inline size_t reiserfs_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(reiserfs_acl_header) +
count * sizeof(reiserfs_acl_entry_short);
} else {
return sizeof(reiserfs_acl_header) +
- 4 * sizeof(reiserfs_acl_entry_short) +
- (count - 4) * sizeof(reiserfs_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
}
}
@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(reiserfs_acl_header);
- s = size - 4 * sizeof(reiserfs_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
if (s < 0) {
if (size % sizeof(reiserfs_acl_entry_short))
return -1;
@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
} else {
if (s % sizeof(reiserfs_acl_entry))
return -1;
- return s / sizeof(reiserfs_acl_entry) + 4;
+ return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 7931efe..d75d2f6 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -26,6 +26,15 @@
#define ACL_MASK (0x10)
#define ACL_OTHER (0x20)
+/*
+ * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
+ *
+ * [1] Where * is the regexp sense of "0 or more times"
+ * [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
+ * otherwise skip ACL_MASK.
+ */
+#define ACL_MAX_SHORT_ENTRY (4)
+
/* permissions in the e_perm field */
#define ACL_READ (0x04)
#define ACL_WRITE (0x02)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2012-12-28 4:31 [PATCH] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation Chen Gang
@ 2012-12-31 15:45 ` Jan Kara
2013-01-04 3:04 ` [PATCH v2] " Chen Gang
1 sibling, 0 replies; 23+ messages in thread
From: Jan Kara @ 2012-12-31 15:45 UTC (permalink / raw)
To: Chen Gang
Cc: jack, akpm, adilger.kernel, Theodore Ts'o, jaegeuk.kim,
dwmw2, torvalds, linux-ext4, linux-f2fs-devel, linux-mtd,
reiserfs-devel
On Fri 28-12-12 12:31:46, Chen Gang wrote:
>
> give comments (by Theodore Ts'o)
>
> ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
>
> [1] Where * is the regexp sense of "0 or more times"
> [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
> otherwise skip ACL_MASK.
>
> use macro instead of hard code number (by Chen Gang)
>
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
...
> diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
> index 7931efe..d75d2f6 100644
> --- a/include/linux/posix_acl.h
> +++ b/include/linux/posix_acl.h
> @@ -26,6 +26,15 @@
> #define ACL_MASK (0x10)
> #define ACL_OTHER (0x20)
>
> +/*
> + * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
> + *
> + * [1] Where * is the regexp sense of "0 or more times"
> + * [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
> + * otherwise skip ACL_MASK.
> + */
> +#define ACL_MAX_SHORT_ENTRY (4)
> +
I agree that defining a constant for this makes sence. Just please be
more verbose with the comment. This is hardly readable for anyone not
knowing what's going on in advance. Also braces around 4 are superfluous.
Add something like the comment below before posix_acl_valid():
/*
* posix_acl_valid() makes sure ACL format is the following:
* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
*
* [1] Where * is the regexp sense of "0 or more times"
* [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
*/
Then add comment before definition of ACL_MAX_SHORT_ENTRY:
/*
* posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
* all of them are short. Otherwise exactly 4 entries are short ones and
* other have full length. See comment before that function for exact ACL
* format.
*/
Honza
> /* permissions in the e_perm field */
> #define ACL_READ (0x04)
> #define ACL_WRITE (0x02)
> --
> 1.7.10.4
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2012-12-31 15:45 ` Jan Kara
0 siblings, 0 replies; 23+ messages in thread
From: Jan Kara @ 2012-12-31 15:45 UTC (permalink / raw)
To: Chen Gang
Cc: jack, torvalds, reiserfs-devel, linux-f2fs-devel, adilger.kernel,
linux-mtd, jaegeuk.kim, Theodore Ts'o, akpm, linux-ext4,
dwmw2
On Fri 28-12-12 12:31:46, Chen Gang wrote:
>
> give comments (by Theodore Ts'o)
>
> ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
>
> [1] Where * is the regexp sense of "0 or more times"
> [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
> otherwise skip ACL_MASK.
>
> use macro instead of hard code number (by Chen Gang)
>
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
...
> diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
> index 7931efe..d75d2f6 100644
> --- a/include/linux/posix_acl.h
> +++ b/include/linux/posix_acl.h
> @@ -26,6 +26,15 @@
> #define ACL_MASK (0x10)
> #define ACL_OTHER (0x20)
>
> +/*
> + * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
> + *
> + * [1] Where * is the regexp sense of "0 or more times"
> + * [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
> + * otherwise skip ACL_MASK.
> + */
> +#define ACL_MAX_SHORT_ENTRY (4)
> +
I agree that defining a constant for this makes sence. Just please be
more verbose with the comment. This is hardly readable for anyone not
knowing what's going on in advance. Also braces around 4 are superfluous.
Add something like the comment below before posix_acl_valid():
/*
* posix_acl_valid() makes sure ACL format is the following:
* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
*
* [1] Where * is the regexp sense of "0 or more times"
* [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
*/
Then add comment before definition of ACL_MAX_SHORT_ENTRY:
/*
* posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
* all of them are short. Otherwise exactly 4 entries are short ones and
* other have full length. See comment before that function for exact ACL
* format.
*/
Honza
> /* permissions in the e_perm field */
> #define ACL_READ (0x04)
> #define ACL_WRITE (0x02)
> --
> 1.7.10.4
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH v2] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2012-12-28 4:31 [PATCH] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation Chen Gang
2012-12-31 15:45 ` Jan Kara
@ 2013-01-04 3:04 ` Chen Gang
2013-01-04 3:19 ` Chen Gang
1 sibling, 1 reply; 23+ messages in thread
From: Chen Gang @ 2013-01-04 3:04 UTC (permalink / raw)
To: jack, akpm, adilger.kernel, Theodore Ts'o, jaegeuk.kim,
dwmw2, torvalds, linux-ext4, linux-f2fs-devel, linux-mtd,
reiserfs-devel
give comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
[1] Where * is the regexp sense of "0 or more times"
[2] Only if there is at least one ACL_USER or ACL_GROUP tag;
otherwise skip ACL_MASK.
give comments (by Jan Kara)
posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
all of them are short. Otherwise exactly 4 entries are short ones and
other have full length. See comment before that function for exact ACL
format.
use macro instead of hard code number (by Chen Gang)
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
fs/ext2/acl.h | 10 +++++-----
fs/ext3/acl.h | 10 +++++-----
fs/ext4/acl.h | 10 +++++-----
fs/f2fs/acl.c | 12 +++++++-----
fs/jffs2/acl.c | 15 +++++++++------
fs/posix_acl.c | 8 ++++++++
fs/reiserfs/acl.h | 10 +++++-----
include/linux/posix_acl.h | 8 ++++++++
8 files changed, 52 insertions(+), 31 deletions(-)
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
index 503bfb0..9af79d0 100644
--- a/fs/ext2/acl.h
+++ b/fs/ext2/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext2_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext2_acl_header) +
count * sizeof(ext2_acl_entry_short);
} else {
return sizeof(ext2_acl_header) +
- 4 * sizeof(ext2_acl_entry_short) +
- (count - 4) * sizeof(ext2_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext2_acl_header);
- s = size - 4 * sizeof(ext2_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext2_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
} else {
if (s % sizeof(ext2_acl_entry))
return -1;
- return s / sizeof(ext2_acl_entry) + 4;
+ return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
index dbc921e..b1cf2c0 100644
--- a/fs/ext3/acl.h
+++ b/fs/ext3/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext3_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext3_acl_header) +
count * sizeof(ext3_acl_entry_short);
} else {
return sizeof(ext3_acl_header) +
- 4 * sizeof(ext3_acl_entry_short) +
- (count - 4) * sizeof(ext3_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext3_acl_header);
- s = size - 4 * sizeof(ext3_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext3_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
} else {
if (s % sizeof(ext3_acl_entry))
return -1;
- return s / sizeof(ext3_acl_entry) + 4;
+ return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index 18cb39e..66d1fa3 100644
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext4_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext4_acl_header) +
count * sizeof(ext4_acl_entry_short);
} else {
return sizeof(ext4_acl_header) +
- 4 * sizeof(ext4_acl_entry_short) +
- (count - 4) * sizeof(ext4_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext4_acl_header);
- s = size - 4 * sizeof(ext4_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext4_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
} else {
if (s % sizeof(ext4_acl_entry))
return -1;
- return s / sizeof(ext4_acl_entry) + 4;
+ return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index fed74d1..42e0070 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -22,13 +22,15 @@
static inline size_t f2fs_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(struct f2fs_acl_header) +
count * sizeof(struct f2fs_acl_entry_short);
} else {
return sizeof(struct f2fs_acl_header) +
- 4 * sizeof(struct f2fs_acl_entry_short) +
- (count - 4) * sizeof(struct f2fs_acl_entry);
+ ACL_MAX_SHORT_ENTRY
+ * sizeof(struct f2fs_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY)
+ * sizeof(struct f2fs_acl_entry);
}
}
@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(struct f2fs_acl_header);
- s = size - 4 * sizeof(struct f2fs_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
if (s < 0) {
if (size % sizeof(struct f2fs_acl_entry_short))
return -1;
@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
} else {
if (s % sizeof(struct f2fs_acl_entry))
return -1;
- return s / sizeof(struct f2fs_acl_entry) + 4;
+ return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 223283c..48ef4b8 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -25,13 +25,15 @@
static size_t jffs2_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(struct jffs2_acl_header)
+ count * sizeof(struct jffs2_acl_entry_short);
} else {
return sizeof(struct jffs2_acl_header)
- + 4 * sizeof(struct jffs2_acl_entry_short)
- + (count - 4) * sizeof(struct jffs2_acl_entry);
+ + ACL_MAX_SHORT_ENTRY
+ * sizeof(struct jffs2_acl_entry_short)
+ + (count - ACL_MAX_SHORT_ENTRY)
+ * sizeof(struct jffs2_acl_entry);
}
}
@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
size_t s;
size -= sizeof(struct jffs2_acl_header);
- if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
+ if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
if (size % sizeof(struct jffs2_acl_entry_short))
return -1;
return size / sizeof(struct jffs2_acl_entry_short);
} else {
- s = size - 4 * sizeof(struct jffs2_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY
+ * sizeof(struct jffs2_acl_entry_short);
if (s % sizeof(struct jffs2_acl_entry))
return -1;
- return s / sizeof(struct jffs2_acl_entry) + 4;
+ return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 8bd2135..8cfdebe 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -72,6 +72,14 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
/*
* Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
+ *
+ * make sure ACL format is the following:
+ *
+ * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
+ *
+ * [1] Where * is the regexp sense of "0 or more times"
+ * [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
+ * otherwise skip ACL_MASK.
*/
int
posix_acl_valid(const struct posix_acl *acl)
diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
index f096b80..cb967a3 100644
--- a/fs/reiserfs/acl.h
+++ b/fs/reiserfs/acl.h
@@ -20,13 +20,13 @@ typedef struct {
static inline size_t reiserfs_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(reiserfs_acl_header) +
count * sizeof(reiserfs_acl_entry_short);
} else {
return sizeof(reiserfs_acl_header) +
- 4 * sizeof(reiserfs_acl_entry_short) +
- (count - 4) * sizeof(reiserfs_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
}
}
@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(reiserfs_acl_header);
- s = size - 4 * sizeof(reiserfs_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
if (s < 0) {
if (size % sizeof(reiserfs_acl_entry_short))
return -1;
@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
} else {
if (s % sizeof(reiserfs_acl_entry))
return -1;
- return s / sizeof(reiserfs_acl_entry) + 4;
+ return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 7931efe..7a8ee64 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -26,6 +26,14 @@
#define ACL_MASK (0x10)
#define ACL_OTHER (0x20)
+/*
+ * posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
+ * all of them are short. Otherwise exactly 4 entries are short ones and
+ * other have full length. See comment before that function for exact ACL
+ * format.
+ */
+#define ACL_MAX_SHORT_ENTRY (4)
+
/* permissions in the e_perm field */
#define ACL_READ (0x04)
#define ACL_WRITE (0x02)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH v2] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2013-01-04 3:04 ` [PATCH v2] " Chen Gang
@ 2013-01-04 3:19 ` Chen Gang
0 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-04 3:19 UTC (permalink / raw)
To: jack, akpm, adilger.kernel, Theodore Ts'o, jaegeuk.kim,
dwmw2, torvalds, linux-ext4, linux-f2fs-devel, linux-mtd,
reiserfs-devel
于 2013年01月04日 11:04, Chen Gang 写道:
> +#define ACL_MAX_SHORT_ENTRY (4)
sorry,
should use "4" instead of "(4)".
I need send patch v3.
--
Chen Gang
Asianux Corporation
--
To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2013-01-04 3:19 ` Chen Gang
0 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-04 3:19 UTC (permalink / raw)
To: jack, akpm, adilger.kernel, Theodore Ts'o, jaegeuk.kim,
dwmw2, torvalds, linux-ext4, linux-f2fs-devel, linux-mtd,
reiserfs-devel
于 2013年01月04日 11:04, Chen Gang 写道:
> +#define ACL_MAX_SHORT_ENTRY (4)
sorry,
should use "4" instead of "(4)".
I need send patch v3.
--
Chen Gang
Asianux Corporation
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH v3] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2013-01-04 3:19 ` Chen Gang
(?)
@ 2013-01-04 3:26 ` Chen Gang
2013-01-07 19:20 ` Jan Kara
-1 siblings, 1 reply; 23+ messages in thread
From: Chen Gang @ 2013-01-04 3:26 UTC (permalink / raw)
To: jack, akpm, adilger.kernel, Theodore Ts'o, jaegeuk.kim,
dwmw2, torvalds, linux-ext4, linux-f2fs-devel, linux-mtd,
reiserfs-devel
give comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
[1] Where * is the regexp sense of "0 or more times"
[2] Only if there is at least one ACL_USER or ACL_GROUP tag;
otherwise skip ACL_MASK.
give comments (by Jan Kara)
posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
all of them are short. Otherwise exactly 4 entries are short ones and
other have full length. See comment before that function for exact ACL
format.
use macro instead of hard code number (by Chen Gang)
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
fs/ext2/acl.h | 10 +++++-----
fs/ext3/acl.h | 10 +++++-----
fs/ext4/acl.h | 10 +++++-----
fs/f2fs/acl.c | 12 +++++++-----
fs/jffs2/acl.c | 15 +++++++++------
fs/posix_acl.c | 8 ++++++++
fs/reiserfs/acl.h | 10 +++++-----
include/linux/posix_acl.h | 8 ++++++++
8 files changed, 52 insertions(+), 31 deletions(-)
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
index 503bfb0..9af79d0 100644
--- a/fs/ext2/acl.h
+++ b/fs/ext2/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext2_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext2_acl_header) +
count * sizeof(ext2_acl_entry_short);
} else {
return sizeof(ext2_acl_header) +
- 4 * sizeof(ext2_acl_entry_short) +
- (count - 4) * sizeof(ext2_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext2_acl_header);
- s = size - 4 * sizeof(ext2_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext2_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
} else {
if (s % sizeof(ext2_acl_entry))
return -1;
- return s / sizeof(ext2_acl_entry) + 4;
+ return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
index dbc921e..b1cf2c0 100644
--- a/fs/ext3/acl.h
+++ b/fs/ext3/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext3_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext3_acl_header) +
count * sizeof(ext3_acl_entry_short);
} else {
return sizeof(ext3_acl_header) +
- 4 * sizeof(ext3_acl_entry_short) +
- (count - 4) * sizeof(ext3_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext3_acl_header);
- s = size - 4 * sizeof(ext3_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext3_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
} else {
if (s % sizeof(ext3_acl_entry))
return -1;
- return s / sizeof(ext3_acl_entry) + 4;
+ return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index 18cb39e..66d1fa3 100644
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext4_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext4_acl_header) +
count * sizeof(ext4_acl_entry_short);
} else {
return sizeof(ext4_acl_header) +
- 4 * sizeof(ext4_acl_entry_short) +
- (count - 4) * sizeof(ext4_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext4_acl_header);
- s = size - 4 * sizeof(ext4_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext4_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
} else {
if (s % sizeof(ext4_acl_entry))
return -1;
- return s / sizeof(ext4_acl_entry) + 4;
+ return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index fed74d1..42e0070 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -22,13 +22,15 @@
static inline size_t f2fs_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(struct f2fs_acl_header) +
count * sizeof(struct f2fs_acl_entry_short);
} else {
return sizeof(struct f2fs_acl_header) +
- 4 * sizeof(struct f2fs_acl_entry_short) +
- (count - 4) * sizeof(struct f2fs_acl_entry);
+ ACL_MAX_SHORT_ENTRY
+ * sizeof(struct f2fs_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY)
+ * sizeof(struct f2fs_acl_entry);
}
}
@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(struct f2fs_acl_header);
- s = size - 4 * sizeof(struct f2fs_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
if (s < 0) {
if (size % sizeof(struct f2fs_acl_entry_short))
return -1;
@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
} else {
if (s % sizeof(struct f2fs_acl_entry))
return -1;
- return s / sizeof(struct f2fs_acl_entry) + 4;
+ return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 223283c..48ef4b8 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -25,13 +25,15 @@
static size_t jffs2_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(struct jffs2_acl_header)
+ count * sizeof(struct jffs2_acl_entry_short);
} else {
return sizeof(struct jffs2_acl_header)
- + 4 * sizeof(struct jffs2_acl_entry_short)
- + (count - 4) * sizeof(struct jffs2_acl_entry);
+ + ACL_MAX_SHORT_ENTRY
+ * sizeof(struct jffs2_acl_entry_short)
+ + (count - ACL_MAX_SHORT_ENTRY)
+ * sizeof(struct jffs2_acl_entry);
}
}
@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
size_t s;
size -= sizeof(struct jffs2_acl_header);
- if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
+ if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
if (size % sizeof(struct jffs2_acl_entry_short))
return -1;
return size / sizeof(struct jffs2_acl_entry_short);
} else {
- s = size - 4 * sizeof(struct jffs2_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY
+ * sizeof(struct jffs2_acl_entry_short);
if (s % sizeof(struct jffs2_acl_entry))
return -1;
- return s / sizeof(struct jffs2_acl_entry) + 4;
+ return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 8bd2135..8cfdebe 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -72,6 +72,14 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
/*
* Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
+ *
+ * make sure ACL format is the following:
+ *
+ * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
+ *
+ * [1] Where * is the regexp sense of "0 or more times"
+ * [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
+ * otherwise skip ACL_MASK.
*/
int
posix_acl_valid(const struct posix_acl *acl)
diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
index f096b80..cb967a3 100644
--- a/fs/reiserfs/acl.h
+++ b/fs/reiserfs/acl.h
@@ -20,13 +20,13 @@ typedef struct {
static inline size_t reiserfs_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(reiserfs_acl_header) +
count * sizeof(reiserfs_acl_entry_short);
} else {
return sizeof(reiserfs_acl_header) +
- 4 * sizeof(reiserfs_acl_entry_short) +
- (count - 4) * sizeof(reiserfs_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
}
}
@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(reiserfs_acl_header);
- s = size - 4 * sizeof(reiserfs_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
if (s < 0) {
if (size % sizeof(reiserfs_acl_entry_short))
return -1;
@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
} else {
if (s % sizeof(reiserfs_acl_entry))
return -1;
- return s / sizeof(reiserfs_acl_entry) + 4;
+ return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 7931efe..2c5609c 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -26,6 +26,14 @@
#define ACL_MASK (0x10)
#define ACL_OTHER (0x20)
+/*
+ * posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
+ * all of them are short. Otherwise exactly 4 entries are short ones and
+ * other have full length. See comment before that function for exact ACL
+ * format.
+ */
+#define ACL_MAX_SHORT_ENTRY 4
+
/* permissions in the e_perm field */
#define ACL_READ (0x04)
#define ACL_WRITE (0x02)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH v3] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2013-01-04 3:26 ` [PATCH v3] " Chen Gang
@ 2013-01-07 19:20 ` Jan Kara
0 siblings, 0 replies; 23+ messages in thread
From: Jan Kara @ 2013-01-07 19:20 UTC (permalink / raw)
To: Chen Gang
Cc: jack, akpm, adilger.kernel, Theodore Ts'o, jaegeuk.kim,
dwmw2, torvalds, linux-ext4, linux-f2fs-devel, linux-mtd,
reiserfs-devel
On Fri 04-01-13 11:26:53, Chen Gang wrote:
>
> give comments (by Theodore Ts'o)
>
> ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
>
> [1] Where * is the regexp sense of "0 or more times"
> [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
> otherwise skip ACL_MASK.
Note that I actually updated the entry [2] to be more precise in my
suggested comment. I wrote:
[2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
Please use this formulation because the old version suggests ACL_MASK
cannot be present if neither ACL_USER nor ACL_GROUP are present and that's
not true. Otherwise your patch looks fine. Thanks!
Honza
>
> give comments (by Jan Kara)
> posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> all of them are short. Otherwise exactly 4 entries are short ones and
> other have full length. See comment before that function for exact ACL
> format.
>
> use macro instead of hard code number (by Chen Gang)
>
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> Signed-off-by: Jan Kara <jack@suse.cz>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
> fs/ext2/acl.h | 10 +++++-----
> fs/ext3/acl.h | 10 +++++-----
> fs/ext4/acl.h | 10 +++++-----
> fs/f2fs/acl.c | 12 +++++++-----
> fs/jffs2/acl.c | 15 +++++++++------
> fs/posix_acl.c | 8 ++++++++
> fs/reiserfs/acl.h | 10 +++++-----
> include/linux/posix_acl.h | 8 ++++++++
> 8 files changed, 52 insertions(+), 31 deletions(-)
>
> diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
> index 503bfb0..9af79d0 100644
> --- a/fs/ext2/acl.h
> +++ b/fs/ext2/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext2_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext2_acl_header) +
> count * sizeof(ext2_acl_entry_short);
> } else {
> return sizeof(ext2_acl_header) +
> - 4 * sizeof(ext2_acl_entry_short) +
> - (count - 4) * sizeof(ext2_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext2_acl_header);
> - s = size - 4 * sizeof(ext2_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext2_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
> } else {
> if (s % sizeof(ext2_acl_entry))
> return -1;
> - return s / sizeof(ext2_acl_entry) + 4;
> + return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
> index dbc921e..b1cf2c0 100644
> --- a/fs/ext3/acl.h
> +++ b/fs/ext3/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext3_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext3_acl_header) +
> count * sizeof(ext3_acl_entry_short);
> } else {
> return sizeof(ext3_acl_header) +
> - 4 * sizeof(ext3_acl_entry_short) +
> - (count - 4) * sizeof(ext3_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext3_acl_header);
> - s = size - 4 * sizeof(ext3_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext3_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
> } else {
> if (s % sizeof(ext3_acl_entry))
> return -1;
> - return s / sizeof(ext3_acl_entry) + 4;
> + return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
> index 18cb39e..66d1fa3 100644
> --- a/fs/ext4/acl.h
> +++ b/fs/ext4/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext4_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext4_acl_header) +
> count * sizeof(ext4_acl_entry_short);
> } else {
> return sizeof(ext4_acl_header) +
> - 4 * sizeof(ext4_acl_entry_short) +
> - (count - 4) * sizeof(ext4_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext4_acl_header);
> - s = size - 4 * sizeof(ext4_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext4_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
> } else {
> if (s % sizeof(ext4_acl_entry))
> return -1;
> - return s / sizeof(ext4_acl_entry) + 4;
> + return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
> index fed74d1..42e0070 100644
> --- a/fs/f2fs/acl.c
> +++ b/fs/f2fs/acl.c
> @@ -22,13 +22,15 @@
>
> static inline size_t f2fs_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(struct f2fs_acl_header) +
> count * sizeof(struct f2fs_acl_entry_short);
> } else {
> return sizeof(struct f2fs_acl_header) +
> - 4 * sizeof(struct f2fs_acl_entry_short) +
> - (count - 4) * sizeof(struct f2fs_acl_entry);
> + ACL_MAX_SHORT_ENTRY
> + * sizeof(struct f2fs_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY)
> + * sizeof(struct f2fs_acl_entry);
> }
> }
>
> @@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(struct f2fs_acl_header);
> - s = size - 4 * sizeof(struct f2fs_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(struct f2fs_acl_entry_short))
> return -1;
> @@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
> } else {
> if (s % sizeof(struct f2fs_acl_entry))
> return -1;
> - return s / sizeof(struct f2fs_acl_entry) + 4;
> + return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
> index 223283c..48ef4b8 100644
> --- a/fs/jffs2/acl.c
> +++ b/fs/jffs2/acl.c
> @@ -25,13 +25,15 @@
>
> static size_t jffs2_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(struct jffs2_acl_header)
> + count * sizeof(struct jffs2_acl_entry_short);
> } else {
> return sizeof(struct jffs2_acl_header)
> - + 4 * sizeof(struct jffs2_acl_entry_short)
> - + (count - 4) * sizeof(struct jffs2_acl_entry);
> + + ACL_MAX_SHORT_ENTRY
> + * sizeof(struct jffs2_acl_entry_short)
> + + (count - ACL_MAX_SHORT_ENTRY)
> + * sizeof(struct jffs2_acl_entry);
> }
> }
>
> @@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
> size_t s;
>
> size -= sizeof(struct jffs2_acl_header);
> - if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
> + if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
> if (size % sizeof(struct jffs2_acl_entry_short))
> return -1;
> return size / sizeof(struct jffs2_acl_entry_short);
> } else {
> - s = size - 4 * sizeof(struct jffs2_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY
> + * sizeof(struct jffs2_acl_entry_short);
> if (s % sizeof(struct jffs2_acl_entry))
> return -1;
> - return s / sizeof(struct jffs2_acl_entry) + 4;
> + return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/posix_acl.c b/fs/posix_acl.c
> index 8bd2135..8cfdebe 100644
> --- a/fs/posix_acl.c
> +++ b/fs/posix_acl.c
> @@ -72,6 +72,14 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
>
> /*
> * Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
> + *
> + * make sure ACL format is the following:
> + *
> + * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
> + *
> + * [1] Where * is the regexp sense of "0 or more times"
> + * [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
> + * otherwise skip ACL_MASK.
> */
> int
> posix_acl_valid(const struct posix_acl *acl)
> diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
> index f096b80..cb967a3 100644
> --- a/fs/reiserfs/acl.h
> +++ b/fs/reiserfs/acl.h
> @@ -20,13 +20,13 @@ typedef struct {
>
> static inline size_t reiserfs_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(reiserfs_acl_header) +
> count * sizeof(reiserfs_acl_entry_short);
> } else {
> return sizeof(reiserfs_acl_header) +
> - 4 * sizeof(reiserfs_acl_entry_short) +
> - (count - 4) * sizeof(reiserfs_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
> }
> }
>
> @@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(reiserfs_acl_header);
> - s = size - 4 * sizeof(reiserfs_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(reiserfs_acl_entry_short))
> return -1;
> @@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
> } else {
> if (s % sizeof(reiserfs_acl_entry))
> return -1;
> - return s / sizeof(reiserfs_acl_entry) + 4;
> + return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
> index 7931efe..2c5609c 100644
> --- a/include/linux/posix_acl.h
> +++ b/include/linux/posix_acl.h
> @@ -26,6 +26,14 @@
> #define ACL_MASK (0x10)
> #define ACL_OTHER (0x20)
>
> +/*
> + * posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> + * all of them are short. Otherwise exactly 4 entries are short ones and
> + * other have full length. See comment before that function for exact ACL
> + * format.
> + */
> +#define ACL_MAX_SHORT_ENTRY 4
> +
> /* permissions in the e_perm field */
> #define ACL_READ (0x04)
> #define ACL_WRITE (0x02)
> --
> 1.7.10.4
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v3] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2013-01-07 19:20 ` Jan Kara
0 siblings, 0 replies; 23+ messages in thread
From: Jan Kara @ 2013-01-07 19:20 UTC (permalink / raw)
To: Chen Gang
Cc: jack, torvalds, reiserfs-devel, linux-f2fs-devel, adilger.kernel,
linux-mtd, jaegeuk.kim, Theodore Ts'o, akpm, linux-ext4,
dwmw2
On Fri 04-01-13 11:26:53, Chen Gang wrote:
>
> give comments (by Theodore Ts'o)
>
> ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
>
> [1] Where * is the regexp sense of "0 or more times"
> [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
> otherwise skip ACL_MASK.
Note that I actually updated the entry [2] to be more precise in my
suggested comment. I wrote:
[2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
Please use this formulation because the old version suggests ACL_MASK
cannot be present if neither ACL_USER nor ACL_GROUP are present and that's
not true. Otherwise your patch looks fine. Thanks!
Honza
>
> give comments (by Jan Kara)
> posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> all of them are short. Otherwise exactly 4 entries are short ones and
> other have full length. See comment before that function for exact ACL
> format.
>
> use macro instead of hard code number (by Chen Gang)
>
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> Signed-off-by: Jan Kara <jack@suse.cz>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
> fs/ext2/acl.h | 10 +++++-----
> fs/ext3/acl.h | 10 +++++-----
> fs/ext4/acl.h | 10 +++++-----
> fs/f2fs/acl.c | 12 +++++++-----
> fs/jffs2/acl.c | 15 +++++++++------
> fs/posix_acl.c | 8 ++++++++
> fs/reiserfs/acl.h | 10 +++++-----
> include/linux/posix_acl.h | 8 ++++++++
> 8 files changed, 52 insertions(+), 31 deletions(-)
>
> diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
> index 503bfb0..9af79d0 100644
> --- a/fs/ext2/acl.h
> +++ b/fs/ext2/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext2_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext2_acl_header) +
> count * sizeof(ext2_acl_entry_short);
> } else {
> return sizeof(ext2_acl_header) +
> - 4 * sizeof(ext2_acl_entry_short) +
> - (count - 4) * sizeof(ext2_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext2_acl_header);
> - s = size - 4 * sizeof(ext2_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext2_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
> } else {
> if (s % sizeof(ext2_acl_entry))
> return -1;
> - return s / sizeof(ext2_acl_entry) + 4;
> + return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
> index dbc921e..b1cf2c0 100644
> --- a/fs/ext3/acl.h
> +++ b/fs/ext3/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext3_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext3_acl_header) +
> count * sizeof(ext3_acl_entry_short);
> } else {
> return sizeof(ext3_acl_header) +
> - 4 * sizeof(ext3_acl_entry_short) +
> - (count - 4) * sizeof(ext3_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext3_acl_header);
> - s = size - 4 * sizeof(ext3_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext3_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
> } else {
> if (s % sizeof(ext3_acl_entry))
> return -1;
> - return s / sizeof(ext3_acl_entry) + 4;
> + return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
> index 18cb39e..66d1fa3 100644
> --- a/fs/ext4/acl.h
> +++ b/fs/ext4/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext4_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext4_acl_header) +
> count * sizeof(ext4_acl_entry_short);
> } else {
> return sizeof(ext4_acl_header) +
> - 4 * sizeof(ext4_acl_entry_short) +
> - (count - 4) * sizeof(ext4_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext4_acl_header);
> - s = size - 4 * sizeof(ext4_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext4_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
> } else {
> if (s % sizeof(ext4_acl_entry))
> return -1;
> - return s / sizeof(ext4_acl_entry) + 4;
> + return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
> index fed74d1..42e0070 100644
> --- a/fs/f2fs/acl.c
> +++ b/fs/f2fs/acl.c
> @@ -22,13 +22,15 @@
>
> static inline size_t f2fs_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(struct f2fs_acl_header) +
> count * sizeof(struct f2fs_acl_entry_short);
> } else {
> return sizeof(struct f2fs_acl_header) +
> - 4 * sizeof(struct f2fs_acl_entry_short) +
> - (count - 4) * sizeof(struct f2fs_acl_entry);
> + ACL_MAX_SHORT_ENTRY
> + * sizeof(struct f2fs_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY)
> + * sizeof(struct f2fs_acl_entry);
> }
> }
>
> @@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(struct f2fs_acl_header);
> - s = size - 4 * sizeof(struct f2fs_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(struct f2fs_acl_entry_short))
> return -1;
> @@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
> } else {
> if (s % sizeof(struct f2fs_acl_entry))
> return -1;
> - return s / sizeof(struct f2fs_acl_entry) + 4;
> + return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
> index 223283c..48ef4b8 100644
> --- a/fs/jffs2/acl.c
> +++ b/fs/jffs2/acl.c
> @@ -25,13 +25,15 @@
>
> static size_t jffs2_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(struct jffs2_acl_header)
> + count * sizeof(struct jffs2_acl_entry_short);
> } else {
> return sizeof(struct jffs2_acl_header)
> - + 4 * sizeof(struct jffs2_acl_entry_short)
> - + (count - 4) * sizeof(struct jffs2_acl_entry);
> + + ACL_MAX_SHORT_ENTRY
> + * sizeof(struct jffs2_acl_entry_short)
> + + (count - ACL_MAX_SHORT_ENTRY)
> + * sizeof(struct jffs2_acl_entry);
> }
> }
>
> @@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
> size_t s;
>
> size -= sizeof(struct jffs2_acl_header);
> - if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
> + if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
> if (size % sizeof(struct jffs2_acl_entry_short))
> return -1;
> return size / sizeof(struct jffs2_acl_entry_short);
> } else {
> - s = size - 4 * sizeof(struct jffs2_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY
> + * sizeof(struct jffs2_acl_entry_short);
> if (s % sizeof(struct jffs2_acl_entry))
> return -1;
> - return s / sizeof(struct jffs2_acl_entry) + 4;
> + return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/posix_acl.c b/fs/posix_acl.c
> index 8bd2135..8cfdebe 100644
> --- a/fs/posix_acl.c
> +++ b/fs/posix_acl.c
> @@ -72,6 +72,14 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
>
> /*
> * Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
> + *
> + * make sure ACL format is the following:
> + *
> + * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
> + *
> + * [1] Where * is the regexp sense of "0 or more times"
> + * [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
> + * otherwise skip ACL_MASK.
> */
> int
> posix_acl_valid(const struct posix_acl *acl)
> diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
> index f096b80..cb967a3 100644
> --- a/fs/reiserfs/acl.h
> +++ b/fs/reiserfs/acl.h
> @@ -20,13 +20,13 @@ typedef struct {
>
> static inline size_t reiserfs_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(reiserfs_acl_header) +
> count * sizeof(reiserfs_acl_entry_short);
> } else {
> return sizeof(reiserfs_acl_header) +
> - 4 * sizeof(reiserfs_acl_entry_short) +
> - (count - 4) * sizeof(reiserfs_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
> }
> }
>
> @@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(reiserfs_acl_header);
> - s = size - 4 * sizeof(reiserfs_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(reiserfs_acl_entry_short))
> return -1;
> @@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
> } else {
> if (s % sizeof(reiserfs_acl_entry))
> return -1;
> - return s / sizeof(reiserfs_acl_entry) + 4;
> + return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
> index 7931efe..2c5609c 100644
> --- a/include/linux/posix_acl.h
> +++ b/include/linux/posix_acl.h
> @@ -26,6 +26,14 @@
> #define ACL_MASK (0x10)
> #define ACL_OTHER (0x20)
>
> +/*
> + * posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> + * all of them are short. Otherwise exactly 4 entries are short ones and
> + * other have full length. See comment before that function for exact ACL
> + * format.
> + */
> +#define ACL_MAX_SHORT_ENTRY 4
> +
> /* permissions in the e_perm field */
> #define ACL_READ (0x04)
> #define ACL_WRITE (0x02)
> --
> 1.7.10.4
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v3] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2013-01-07 19:20 ` Jan Kara
@ 2013-01-08 2:02 ` Chen Gang
-1 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-08 2:02 UTC (permalink / raw)
To: Jan Kara
Cc: akpm, adilger.kernel, Theodore Ts'o, jaegeuk.kim, dwmw2,
torvalds, linux-ext4, linux-f2fs-devel, linux-mtd,
reiserfs-devel
于 2013年01月08日 03:20, Jan Kara 写道:
> On Fri 04-01-13 11:26:53, Chen Gang wrote:
>> >
>> > give comments (by Theodore Ts'o)
>> >
>> > ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
>> >
>> > [1] Where * is the regexp sense of "0 or more times"
>> > [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
>> > otherwise skip ACL_MASK.
> Note that I actually updated the entry [2] to be more precise in my
> suggested comment. I wrote:
> [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
>
> Please use this formulation because the old version suggests ACL_MASK
> cannot be present if neither ACL_USER nor ACL_GROUP are present and that's
> not true. Otherwise your patch looks fine. Thanks!
according to the implementation of posix_acl_valid (contents at bottom).
new comments are more precise to match the implementation.
it means:
if new comments was incorrect, the implementation would be incorrect.
welcome another members (especially Theodore Ts'o) to giving confirmation or completion.
I should wait 2 days, before send patch v4 with new comments.
no additional reply within 2 days, means new comments is correct.
Regards
gchen.
76 int
77 posix_acl_valid(const struct posix_acl *acl)
78 {
79 const struct posix_acl_entry *pa, *pe;
80 int state = ACL_USER_OBJ;
81 kuid_t prev_uid = INVALID_UID;
82 kgid_t prev_gid = INVALID_GID;
83 int needs_mask = 0;
84
85 FOREACH_ACL_ENTRY(pa, acl, pe) {
86 if (pa->e_perm & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE))
87 return -EINVAL;
88 switch (pa->e_tag) {
89 case ACL_USER_OBJ:
90 if (state == ACL_USER_OBJ) {
91 state = ACL_USER;
92 break;
93 }
94 return -EINVAL;
95
96 case ACL_USER:
97 if (state != ACL_USER)
98 return -EINVAL;
99 if (!uid_valid(pa->e_uid))
100 return -EINVAL;
101 if (uid_valid(prev_uid) &&
102 uid_lte(pa->e_uid, prev_uid))
103 return -EINVAL;
104 prev_uid = pa->e_uid;
105 needs_mask = 1;
106 break;
107
108 case ACL_GROUP_OBJ:
109 if (state == ACL_USER) {
110 state = ACL_GROUP;
111 break;
112 }
113 return -EINVAL;
114
115 case ACL_GROUP:
116 if (state != ACL_GROUP)
117 return -EINVAL;
118 if (!gid_valid(pa->e_gid))
119 return -EINVAL;
120 if (gid_valid(prev_gid) &&
121 gid_lte(pa->e_gid, prev_gid))
122 return -EINVAL;
123 prev_gid = pa->e_gid;
124 needs_mask = 1;
125 break;
126
127 case ACL_MASK:
128 if (state != ACL_GROUP)
129 return -EINVAL;
130 state = ACL_OTHER;
131 break;
132
133 case ACL_OTHER:
134 if (state == ACL_OTHER ||
135 (state == ACL_GROUP && !needs_mask)) {
136 state = 0;
137 break;
138 }
139 return -EINVAL;
140
141 default:
142 return -EINVAL;
143 }
144 }
145 if (state == 0)
146 return 0;
147 return -EINVAL;
148 }
--
Chen Gang
Asianux Corporation
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v3] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2013-01-08 2:02 ` Chen Gang
0 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-08 2:02 UTC (permalink / raw)
To: Jan Kara
Cc: Theodore Ts'o, dwmw2, reiserfs-devel, linux-f2fs-devel,
adilger.kernel, linux-mtd, jaegeuk.kim, akpm, linux-ext4,
torvalds
于 2013年01月08日 03:20, Jan Kara 写道:
> On Fri 04-01-13 11:26:53, Chen Gang wrote:
>> >
>> > give comments (by Theodore Ts'o)
>> >
>> > ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
>> >
>> > [1] Where * is the regexp sense of "0 or more times"
>> > [2] Only if there is at least one ACL_USER or ACL_GROUP tag;
>> > otherwise skip ACL_MASK.
> Note that I actually updated the entry [2] to be more precise in my
> suggested comment. I wrote:
> [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
>
> Please use this formulation because the old version suggests ACL_MASK
> cannot be present if neither ACL_USER nor ACL_GROUP are present and that's
> not true. Otherwise your patch looks fine. Thanks!
according to the implementation of posix_acl_valid (contents at bottom).
new comments are more precise to match the implementation.
it means:
if new comments was incorrect, the implementation would be incorrect.
welcome another members (especially Theodore Ts'o) to giving confirmation or completion.
I should wait 2 days, before send patch v4 with new comments.
no additional reply within 2 days, means new comments is correct.
Regards
gchen.
76 int
77 posix_acl_valid(const struct posix_acl *acl)
78 {
79 const struct posix_acl_entry *pa, *pe;
80 int state = ACL_USER_OBJ;
81 kuid_t prev_uid = INVALID_UID;
82 kgid_t prev_gid = INVALID_GID;
83 int needs_mask = 0;
84
85 FOREACH_ACL_ENTRY(pa, acl, pe) {
86 if (pa->e_perm & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE))
87 return -EINVAL;
88 switch (pa->e_tag) {
89 case ACL_USER_OBJ:
90 if (state == ACL_USER_OBJ) {
91 state = ACL_USER;
92 break;
93 }
94 return -EINVAL;
95
96 case ACL_USER:
97 if (state != ACL_USER)
98 return -EINVAL;
99 if (!uid_valid(pa->e_uid))
100 return -EINVAL;
101 if (uid_valid(prev_uid) &&
102 uid_lte(pa->e_uid, prev_uid))
103 return -EINVAL;
104 prev_uid = pa->e_uid;
105 needs_mask = 1;
106 break;
107
108 case ACL_GROUP_OBJ:
109 if (state == ACL_USER) {
110 state = ACL_GROUP;
111 break;
112 }
113 return -EINVAL;
114
115 case ACL_GROUP:
116 if (state != ACL_GROUP)
117 return -EINVAL;
118 if (!gid_valid(pa->e_gid))
119 return -EINVAL;
120 if (gid_valid(prev_gid) &&
121 gid_lte(pa->e_gid, prev_gid))
122 return -EINVAL;
123 prev_gid = pa->e_gid;
124 needs_mask = 1;
125 break;
126
127 case ACL_MASK:
128 if (state != ACL_GROUP)
129 return -EINVAL;
130 state = ACL_OTHER;
131 break;
132
133 case ACL_OTHER:
134 if (state == ACL_OTHER ||
135 (state == ACL_GROUP && !needs_mask)) {
136 state = 0;
137 break;
138 }
139 return -EINVAL;
140
141 default:
142 return -EINVAL;
143 }
144 }
145 if (state == 0)
146 return 0;
147 return -EINVAL;
148 }
--
Chen Gang
Asianux Corporation
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2013-01-07 19:20 ` Jan Kara
@ 2013-01-11 8:58 ` Chen Gang
-1 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-11 8:58 UTC (permalink / raw)
To: Jan Kara, akpm, Theodore Ts'o, jaegeuk.kim, dwmw2
Cc: adilger.kernel, torvalds, linux-ext4, linux-f2fs-devel,
linux-mtd, reiserfs-devel
give comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
[1] Where * is the regexp sense of "0 or more times"
[2] ...
give comments (by Jan Kara)
posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
all of them are short. Otherwise exactly 4 entries are short ones and
other have full length. See comment before that function for exact ACL
format.
also correct the '[2]' comments:
[2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
use macro instead of hard code number (by Chen Gang)
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
fs/ext2/acl.h | 10 +++++-----
fs/ext3/acl.h | 10 +++++-----
fs/ext4/acl.h | 10 +++++-----
fs/f2fs/acl.c | 12 +++++++-----
fs/jffs2/acl.c | 15 +++++++++------
fs/posix_acl.c | 7 +++++++
fs/reiserfs/acl.h | 10 +++++-----
include/linux/posix_acl.h | 8 ++++++++
8 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
index 503bfb0..9af79d0 100644
--- a/fs/ext2/acl.h
+++ b/fs/ext2/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext2_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext2_acl_header) +
count * sizeof(ext2_acl_entry_short);
} else {
return sizeof(ext2_acl_header) +
- 4 * sizeof(ext2_acl_entry_short) +
- (count - 4) * sizeof(ext2_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext2_acl_header);
- s = size - 4 * sizeof(ext2_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext2_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
} else {
if (s % sizeof(ext2_acl_entry))
return -1;
- return s / sizeof(ext2_acl_entry) + 4;
+ return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
index dbc921e..b1cf2c0 100644
--- a/fs/ext3/acl.h
+++ b/fs/ext3/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext3_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext3_acl_header) +
count * sizeof(ext3_acl_entry_short);
} else {
return sizeof(ext3_acl_header) +
- 4 * sizeof(ext3_acl_entry_short) +
- (count - 4) * sizeof(ext3_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext3_acl_header);
- s = size - 4 * sizeof(ext3_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext3_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
} else {
if (s % sizeof(ext3_acl_entry))
return -1;
- return s / sizeof(ext3_acl_entry) + 4;
+ return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index 18cb39e..66d1fa3 100644
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext4_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext4_acl_header) +
count * sizeof(ext4_acl_entry_short);
} else {
return sizeof(ext4_acl_header) +
- 4 * sizeof(ext4_acl_entry_short) +
- (count - 4) * sizeof(ext4_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext4_acl_header);
- s = size - 4 * sizeof(ext4_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext4_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
} else {
if (s % sizeof(ext4_acl_entry))
return -1;
- return s / sizeof(ext4_acl_entry) + 4;
+ return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index 137af42..3e5a717 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -22,13 +22,15 @@
static inline size_t f2fs_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(struct f2fs_acl_header) +
count * sizeof(struct f2fs_acl_entry_short);
} else {
return sizeof(struct f2fs_acl_header) +
- 4 * sizeof(struct f2fs_acl_entry_short) +
- (count - 4) * sizeof(struct f2fs_acl_entry);
+ ACL_MAX_SHORT_ENTRY
+ * sizeof(struct f2fs_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY)
+ * sizeof(struct f2fs_acl_entry);
}
}
@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(struct f2fs_acl_header);
- s = size - 4 * sizeof(struct f2fs_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
if (s < 0) {
if (size % sizeof(struct f2fs_acl_entry_short))
return -1;
@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
} else {
if (s % sizeof(struct f2fs_acl_entry))
return -1;
- return s / sizeof(struct f2fs_acl_entry) + 4;
+ return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 223283c..48ef4b8 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -25,13 +25,15 @@
static size_t jffs2_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(struct jffs2_acl_header)
+ count * sizeof(struct jffs2_acl_entry_short);
} else {
return sizeof(struct jffs2_acl_header)
- + 4 * sizeof(struct jffs2_acl_entry_short)
- + (count - 4) * sizeof(struct jffs2_acl_entry);
+ + ACL_MAX_SHORT_ENTRY
+ * sizeof(struct jffs2_acl_entry_short)
+ + (count - ACL_MAX_SHORT_ENTRY)
+ * sizeof(struct jffs2_acl_entry);
}
}
@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
size_t s;
size -= sizeof(struct jffs2_acl_header);
- if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
+ if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
if (size % sizeof(struct jffs2_acl_entry_short))
return -1;
return size / sizeof(struct jffs2_acl_entry_short);
} else {
- s = size - 4 * sizeof(struct jffs2_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY
+ * sizeof(struct jffs2_acl_entry_short);
if (s % sizeof(struct jffs2_acl_entry))
return -1;
- return s / sizeof(struct jffs2_acl_entry) + 4;
+ return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 8bd2135..15b1b0c 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -72,6 +72,13 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
/*
* Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
+ *
+ * make sure ACL format is the following:
+ *
+ * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
+ *
+ * [1] Where * is the regexp sense of "0 or more times"
+ * [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
*/
int
posix_acl_valid(const struct posix_acl *acl)
diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
index f096b80..cb967a3 100644
--- a/fs/reiserfs/acl.h
+++ b/fs/reiserfs/acl.h
@@ -20,13 +20,13 @@ typedef struct {
static inline size_t reiserfs_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(reiserfs_acl_header) +
count * sizeof(reiserfs_acl_entry_short);
} else {
return sizeof(reiserfs_acl_header) +
- 4 * sizeof(reiserfs_acl_entry_short) +
- (count - 4) * sizeof(reiserfs_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
}
}
@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(reiserfs_acl_header);
- s = size - 4 * sizeof(reiserfs_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
if (s < 0) {
if (size % sizeof(reiserfs_acl_entry_short))
return -1;
@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
} else {
if (s % sizeof(reiserfs_acl_entry))
return -1;
- return s / sizeof(reiserfs_acl_entry) + 4;
+ return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 7931efe..2c5609c 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -26,6 +26,14 @@
#define ACL_MASK (0x10)
#define ACL_OTHER (0x20)
+/*
+ * posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
+ * all of them are short. Otherwise exactly 4 entries are short ones and
+ * other have full length. See comment before that function for exact ACL
+ * format.
+ */
+#define ACL_MAX_SHORT_ENTRY 4
+
/* permissions in the e_perm field */
#define ACL_READ (0x04)
#define ACL_WRITE (0x02)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2013-01-11 8:58 ` Chen Gang
0 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-11 8:58 UTC (permalink / raw)
To: Jan Kara, akpm, Theodore Ts'o, jaegeuk.kim, dwmw2
Cc: reiserfs-devel, linux-f2fs-devel, adilger.kernel, linux-mtd,
linux-ext4, torvalds
give comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
[1] Where * is the regexp sense of "0 or more times"
[2] ...
give comments (by Jan Kara)
posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
all of them are short. Otherwise exactly 4 entries are short ones and
other have full length. See comment before that function for exact ACL
format.
also correct the '[2]' comments:
[2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
use macro instead of hard code number (by Chen Gang)
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
fs/ext2/acl.h | 10 +++++-----
fs/ext3/acl.h | 10 +++++-----
fs/ext4/acl.h | 10 +++++-----
fs/f2fs/acl.c | 12 +++++++-----
fs/jffs2/acl.c | 15 +++++++++------
fs/posix_acl.c | 7 +++++++
fs/reiserfs/acl.h | 10 +++++-----
include/linux/posix_acl.h | 8 ++++++++
8 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
index 503bfb0..9af79d0 100644
--- a/fs/ext2/acl.h
+++ b/fs/ext2/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext2_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext2_acl_header) +
count * sizeof(ext2_acl_entry_short);
} else {
return sizeof(ext2_acl_header) +
- 4 * sizeof(ext2_acl_entry_short) +
- (count - 4) * sizeof(ext2_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext2_acl_header);
- s = size - 4 * sizeof(ext2_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext2_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
} else {
if (s % sizeof(ext2_acl_entry))
return -1;
- return s / sizeof(ext2_acl_entry) + 4;
+ return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
index dbc921e..b1cf2c0 100644
--- a/fs/ext3/acl.h
+++ b/fs/ext3/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext3_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext3_acl_header) +
count * sizeof(ext3_acl_entry_short);
} else {
return sizeof(ext3_acl_header) +
- 4 * sizeof(ext3_acl_entry_short) +
- (count - 4) * sizeof(ext3_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext3_acl_header);
- s = size - 4 * sizeof(ext3_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext3_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
} else {
if (s % sizeof(ext3_acl_entry))
return -1;
- return s / sizeof(ext3_acl_entry) + 4;
+ return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index 18cb39e..66d1fa3 100644
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -25,13 +25,13 @@ typedef struct {
static inline size_t ext4_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(ext4_acl_header) +
count * sizeof(ext4_acl_entry_short);
} else {
return sizeof(ext4_acl_header) +
- 4 * sizeof(ext4_acl_entry_short) +
- (count - 4) * sizeof(ext4_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
}
}
@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(ext4_acl_header);
- s = size - 4 * sizeof(ext4_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
if (s < 0) {
if (size % sizeof(ext4_acl_entry_short))
return -1;
@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
} else {
if (s % sizeof(ext4_acl_entry))
return -1;
- return s / sizeof(ext4_acl_entry) + 4;
+ return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index 137af42..3e5a717 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -22,13 +22,15 @@
static inline size_t f2fs_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(struct f2fs_acl_header) +
count * sizeof(struct f2fs_acl_entry_short);
} else {
return sizeof(struct f2fs_acl_header) +
- 4 * sizeof(struct f2fs_acl_entry_short) +
- (count - 4) * sizeof(struct f2fs_acl_entry);
+ ACL_MAX_SHORT_ENTRY
+ * sizeof(struct f2fs_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY)
+ * sizeof(struct f2fs_acl_entry);
}
}
@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(struct f2fs_acl_header);
- s = size - 4 * sizeof(struct f2fs_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
if (s < 0) {
if (size % sizeof(struct f2fs_acl_entry_short))
return -1;
@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
} else {
if (s % sizeof(struct f2fs_acl_entry))
return -1;
- return s / sizeof(struct f2fs_acl_entry) + 4;
+ return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 223283c..48ef4b8 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -25,13 +25,15 @@
static size_t jffs2_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(struct jffs2_acl_header)
+ count * sizeof(struct jffs2_acl_entry_short);
} else {
return sizeof(struct jffs2_acl_header)
- + 4 * sizeof(struct jffs2_acl_entry_short)
- + (count - 4) * sizeof(struct jffs2_acl_entry);
+ + ACL_MAX_SHORT_ENTRY
+ * sizeof(struct jffs2_acl_entry_short)
+ + (count - ACL_MAX_SHORT_ENTRY)
+ * sizeof(struct jffs2_acl_entry);
}
}
@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
size_t s;
size -= sizeof(struct jffs2_acl_header);
- if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
+ if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
if (size % sizeof(struct jffs2_acl_entry_short))
return -1;
return size / sizeof(struct jffs2_acl_entry_short);
} else {
- s = size - 4 * sizeof(struct jffs2_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY
+ * sizeof(struct jffs2_acl_entry_short);
if (s % sizeof(struct jffs2_acl_entry))
return -1;
- return s / sizeof(struct jffs2_acl_entry) + 4;
+ return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 8bd2135..15b1b0c 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -72,6 +72,13 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
/*
* Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
+ *
+ * make sure ACL format is the following:
+ *
+ * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
+ *
+ * [1] Where * is the regexp sense of "0 or more times"
+ * [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
*/
int
posix_acl_valid(const struct posix_acl *acl)
diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
index f096b80..cb967a3 100644
--- a/fs/reiserfs/acl.h
+++ b/fs/reiserfs/acl.h
@@ -20,13 +20,13 @@ typedef struct {
static inline size_t reiserfs_acl_size(int count)
{
- if (count <= 4) {
+ if (count <= ACL_MAX_SHORT_ENTRY) {
return sizeof(reiserfs_acl_header) +
count * sizeof(reiserfs_acl_entry_short);
} else {
return sizeof(reiserfs_acl_header) +
- 4 * sizeof(reiserfs_acl_entry_short) +
- (count - 4) * sizeof(reiserfs_acl_entry);
+ ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
+ (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
}
}
@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
{
ssize_t s;
size -= sizeof(reiserfs_acl_header);
- s = size - 4 * sizeof(reiserfs_acl_entry_short);
+ s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
if (s < 0) {
if (size % sizeof(reiserfs_acl_entry_short))
return -1;
@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
} else {
if (s % sizeof(reiserfs_acl_entry))
return -1;
- return s / sizeof(reiserfs_acl_entry) + 4;
+ return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
}
}
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 7931efe..2c5609c 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -26,6 +26,14 @@
#define ACL_MASK (0x10)
#define ACL_OTHER (0x20)
+/*
+ * posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
+ * all of them are short. Otherwise exactly 4 entries are short ones and
+ * other have full length. See comment before that function for exact ACL
+ * format.
+ */
+#define ACL_MAX_SHORT_ENTRY 4
+
/* permissions in the e_perm field */
#define ACL_READ (0x04)
#define ACL_WRITE (0x02)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2013-01-11 8:58 ` Chen Gang
@ 2013-01-20 7:02 ` Chen Gang
-1 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-20 7:02 UTC (permalink / raw)
To: Jan Kara, akpm, Theodore Ts'o, jaegeuk.kim, dwmw2, dwmw2,
viro, paul.gortmaker, ebiederm
Cc: adilger.kernel, torvalds, linux-ext4, linux-f2fs-devel,
linux-mtd, reiserfs-devel, linux-fsdevel
Hello all:
consult:
excuse me, I wonder who is the final applier of this patch ?
it seems too many relative members are in this mailing list.
(it is why I also included torvalds@linux-foundation.org as 'THE REST')
thanks.
:-)
by the way:
originally, I send this mail by checking MAINTAINERS file, mannualy.
and this time (now), I reply this mail by using scripts/get_maintainers.pl.
(but still add torvalds@linux-foundation.org as 'THE REST')
Regards
gchen.
于 2013年01月11日 16:58, Chen Gang 写道:
>
> give comments (by Theodore Ts'o)
>
> ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
>
> [1] Where * is the regexp sense of "0 or more times"
> [2] ...
>
> give comments (by Jan Kara)
> posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> all of them are short. Otherwise exactly 4 entries are short ones and
> other have full length. See comment before that function for exact ACL
> format.
> also correct the '[2]' comments:
> [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
>
> use macro instead of hard code number (by Chen Gang)
>
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> Signed-off-by: Jan Kara <jack@suse.cz>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
> fs/ext2/acl.h | 10 +++++-----
> fs/ext3/acl.h | 10 +++++-----
> fs/ext4/acl.h | 10 +++++-----
> fs/f2fs/acl.c | 12 +++++++-----
> fs/jffs2/acl.c | 15 +++++++++------
> fs/posix_acl.c | 7 +++++++
> fs/reiserfs/acl.h | 10 +++++-----
> include/linux/posix_acl.h | 8 ++++++++
> 8 files changed, 51 insertions(+), 31 deletions(-)
>
> diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
> index 503bfb0..9af79d0 100644
> --- a/fs/ext2/acl.h
> +++ b/fs/ext2/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext2_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext2_acl_header) +
> count * sizeof(ext2_acl_entry_short);
> } else {
> return sizeof(ext2_acl_header) +
> - 4 * sizeof(ext2_acl_entry_short) +
> - (count - 4) * sizeof(ext2_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext2_acl_header);
> - s = size - 4 * sizeof(ext2_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext2_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
> } else {
> if (s % sizeof(ext2_acl_entry))
> return -1;
> - return s / sizeof(ext2_acl_entry) + 4;
> + return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
> index dbc921e..b1cf2c0 100644
> --- a/fs/ext3/acl.h
> +++ b/fs/ext3/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext3_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext3_acl_header) +
> count * sizeof(ext3_acl_entry_short);
> } else {
> return sizeof(ext3_acl_header) +
> - 4 * sizeof(ext3_acl_entry_short) +
> - (count - 4) * sizeof(ext3_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext3_acl_header);
> - s = size - 4 * sizeof(ext3_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext3_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
> } else {
> if (s % sizeof(ext3_acl_entry))
> return -1;
> - return s / sizeof(ext3_acl_entry) + 4;
> + return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
> index 18cb39e..66d1fa3 100644
> --- a/fs/ext4/acl.h
> +++ b/fs/ext4/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext4_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext4_acl_header) +
> count * sizeof(ext4_acl_entry_short);
> } else {
> return sizeof(ext4_acl_header) +
> - 4 * sizeof(ext4_acl_entry_short) +
> - (count - 4) * sizeof(ext4_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext4_acl_header);
> - s = size - 4 * sizeof(ext4_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext4_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
> } else {
> if (s % sizeof(ext4_acl_entry))
> return -1;
> - return s / sizeof(ext4_acl_entry) + 4;
> + return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
> index 137af42..3e5a717 100644
> --- a/fs/f2fs/acl.c
> +++ b/fs/f2fs/acl.c
> @@ -22,13 +22,15 @@
>
> static inline size_t f2fs_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(struct f2fs_acl_header) +
> count * sizeof(struct f2fs_acl_entry_short);
> } else {
> return sizeof(struct f2fs_acl_header) +
> - 4 * sizeof(struct f2fs_acl_entry_short) +
> - (count - 4) * sizeof(struct f2fs_acl_entry);
> + ACL_MAX_SHORT_ENTRY
> + * sizeof(struct f2fs_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY)
> + * sizeof(struct f2fs_acl_entry);
> }
> }
>
> @@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(struct f2fs_acl_header);
> - s = size - 4 * sizeof(struct f2fs_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(struct f2fs_acl_entry_short))
> return -1;
> @@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
> } else {
> if (s % sizeof(struct f2fs_acl_entry))
> return -1;
> - return s / sizeof(struct f2fs_acl_entry) + 4;
> + return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
> index 223283c..48ef4b8 100644
> --- a/fs/jffs2/acl.c
> +++ b/fs/jffs2/acl.c
> @@ -25,13 +25,15 @@
>
> static size_t jffs2_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(struct jffs2_acl_header)
> + count * sizeof(struct jffs2_acl_entry_short);
> } else {
> return sizeof(struct jffs2_acl_header)
> - + 4 * sizeof(struct jffs2_acl_entry_short)
> - + (count - 4) * sizeof(struct jffs2_acl_entry);
> + + ACL_MAX_SHORT_ENTRY
> + * sizeof(struct jffs2_acl_entry_short)
> + + (count - ACL_MAX_SHORT_ENTRY)
> + * sizeof(struct jffs2_acl_entry);
> }
> }
>
> @@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
> size_t s;
>
> size -= sizeof(struct jffs2_acl_header);
> - if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
> + if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
> if (size % sizeof(struct jffs2_acl_entry_short))
> return -1;
> return size / sizeof(struct jffs2_acl_entry_short);
> } else {
> - s = size - 4 * sizeof(struct jffs2_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY
> + * sizeof(struct jffs2_acl_entry_short);
> if (s % sizeof(struct jffs2_acl_entry))
> return -1;
> - return s / sizeof(struct jffs2_acl_entry) + 4;
> + return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/posix_acl.c b/fs/posix_acl.c
> index 8bd2135..15b1b0c 100644
> --- a/fs/posix_acl.c
> +++ b/fs/posix_acl.c
> @@ -72,6 +72,13 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
>
> /*
> * Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
> + *
> + * make sure ACL format is the following:
> + *
> + * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
> + *
> + * [1] Where * is the regexp sense of "0 or more times"
> + * [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
> */
> int
> posix_acl_valid(const struct posix_acl *acl)
> diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
> index f096b80..cb967a3 100644
> --- a/fs/reiserfs/acl.h
> +++ b/fs/reiserfs/acl.h
> @@ -20,13 +20,13 @@ typedef struct {
>
> static inline size_t reiserfs_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(reiserfs_acl_header) +
> count * sizeof(reiserfs_acl_entry_short);
> } else {
> return sizeof(reiserfs_acl_header) +
> - 4 * sizeof(reiserfs_acl_entry_short) +
> - (count - 4) * sizeof(reiserfs_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
> }
> }
>
> @@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(reiserfs_acl_header);
> - s = size - 4 * sizeof(reiserfs_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(reiserfs_acl_entry_short))
> return -1;
> @@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
> } else {
> if (s % sizeof(reiserfs_acl_entry))
> return -1;
> - return s / sizeof(reiserfs_acl_entry) + 4;
> + return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
> index 7931efe..2c5609c 100644
> --- a/include/linux/posix_acl.h
> +++ b/include/linux/posix_acl.h
> @@ -26,6 +26,14 @@
> #define ACL_MASK (0x10)
> #define ACL_OTHER (0x20)
>
> +/*
> + * posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> + * all of them are short. Otherwise exactly 4 entries are short ones and
> + * other have full length. See comment before that function for exact ACL
> + * format.
> + */
> +#define ACL_MAX_SHORT_ENTRY 4
> +
> /* permissions in the e_perm field */
> #define ACL_READ (0x04)
> #define ACL_WRITE (0x02)
>
--
Chen Gang
Asianux Corporation
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2013-01-20 7:02 ` Chen Gang
0 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-20 7:02 UTC (permalink / raw)
To: Jan Kara, akpm, Theodore Ts'o, jaegeuk.kim, dwmw2, dwmw2,
viro, paul.gortmaker, ebiederm
Cc: reiserfs-devel, linux-f2fs-devel, adilger.kernel, linux-fsdevel,
linux-mtd, linux-ext4, torvalds
Hello all:
consult:
excuse me, I wonder who is the final applier of this patch ?
it seems too many relative members are in this mailing list.
(it is why I also included torvalds@linux-foundation.org as 'THE REST')
thanks.
:-)
by the way:
originally, I send this mail by checking MAINTAINERS file, mannualy.
and this time (now), I reply this mail by using scripts/get_maintainers.pl.
(but still add torvalds@linux-foundation.org as 'THE REST')
Regards
gchen.
于 2013年01月11日 16:58, Chen Gang 写道:
>
> give comments (by Theodore Ts'o)
>
> ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
>
> [1] Where * is the regexp sense of "0 or more times"
> [2] ...
>
> give comments (by Jan Kara)
> posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> all of them are short. Otherwise exactly 4 entries are short ones and
> other have full length. See comment before that function for exact ACL
> format.
> also correct the '[2]' comments:
> [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
>
> use macro instead of hard code number (by Chen Gang)
>
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> Signed-off-by: Jan Kara <jack@suse.cz>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
> fs/ext2/acl.h | 10 +++++-----
> fs/ext3/acl.h | 10 +++++-----
> fs/ext4/acl.h | 10 +++++-----
> fs/f2fs/acl.c | 12 +++++++-----
> fs/jffs2/acl.c | 15 +++++++++------
> fs/posix_acl.c | 7 +++++++
> fs/reiserfs/acl.h | 10 +++++-----
> include/linux/posix_acl.h | 8 ++++++++
> 8 files changed, 51 insertions(+), 31 deletions(-)
>
> diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
> index 503bfb0..9af79d0 100644
> --- a/fs/ext2/acl.h
> +++ b/fs/ext2/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext2_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext2_acl_header) +
> count * sizeof(ext2_acl_entry_short);
> } else {
> return sizeof(ext2_acl_header) +
> - 4 * sizeof(ext2_acl_entry_short) +
> - (count - 4) * sizeof(ext2_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext2_acl_header);
> - s = size - 4 * sizeof(ext2_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext2_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
> } else {
> if (s % sizeof(ext2_acl_entry))
> return -1;
> - return s / sizeof(ext2_acl_entry) + 4;
> + return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
> index dbc921e..b1cf2c0 100644
> --- a/fs/ext3/acl.h
> +++ b/fs/ext3/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext3_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext3_acl_header) +
> count * sizeof(ext3_acl_entry_short);
> } else {
> return sizeof(ext3_acl_header) +
> - 4 * sizeof(ext3_acl_entry_short) +
> - (count - 4) * sizeof(ext3_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext3_acl_header);
> - s = size - 4 * sizeof(ext3_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext3_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
> } else {
> if (s % sizeof(ext3_acl_entry))
> return -1;
> - return s / sizeof(ext3_acl_entry) + 4;
> + return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
> index 18cb39e..66d1fa3 100644
> --- a/fs/ext4/acl.h
> +++ b/fs/ext4/acl.h
> @@ -25,13 +25,13 @@ typedef struct {
>
> static inline size_t ext4_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(ext4_acl_header) +
> count * sizeof(ext4_acl_entry_short);
> } else {
> return sizeof(ext4_acl_header) +
> - 4 * sizeof(ext4_acl_entry_short) +
> - (count - 4) * sizeof(ext4_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
> }
> }
>
> @@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(ext4_acl_header);
> - s = size - 4 * sizeof(ext4_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(ext4_acl_entry_short))
> return -1;
> @@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
> } else {
> if (s % sizeof(ext4_acl_entry))
> return -1;
> - return s / sizeof(ext4_acl_entry) + 4;
> + return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
> index 137af42..3e5a717 100644
> --- a/fs/f2fs/acl.c
> +++ b/fs/f2fs/acl.c
> @@ -22,13 +22,15 @@
>
> static inline size_t f2fs_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(struct f2fs_acl_header) +
> count * sizeof(struct f2fs_acl_entry_short);
> } else {
> return sizeof(struct f2fs_acl_header) +
> - 4 * sizeof(struct f2fs_acl_entry_short) +
> - (count - 4) * sizeof(struct f2fs_acl_entry);
> + ACL_MAX_SHORT_ENTRY
> + * sizeof(struct f2fs_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY)
> + * sizeof(struct f2fs_acl_entry);
> }
> }
>
> @@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(struct f2fs_acl_header);
> - s = size - 4 * sizeof(struct f2fs_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(struct f2fs_acl_entry_short))
> return -1;
> @@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
> } else {
> if (s % sizeof(struct f2fs_acl_entry))
> return -1;
> - return s / sizeof(struct f2fs_acl_entry) + 4;
> + return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
> index 223283c..48ef4b8 100644
> --- a/fs/jffs2/acl.c
> +++ b/fs/jffs2/acl.c
> @@ -25,13 +25,15 @@
>
> static size_t jffs2_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(struct jffs2_acl_header)
> + count * sizeof(struct jffs2_acl_entry_short);
> } else {
> return sizeof(struct jffs2_acl_header)
> - + 4 * sizeof(struct jffs2_acl_entry_short)
> - + (count - 4) * sizeof(struct jffs2_acl_entry);
> + + ACL_MAX_SHORT_ENTRY
> + * sizeof(struct jffs2_acl_entry_short)
> + + (count - ACL_MAX_SHORT_ENTRY)
> + * sizeof(struct jffs2_acl_entry);
> }
> }
>
> @@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
> size_t s;
>
> size -= sizeof(struct jffs2_acl_header);
> - if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
> + if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
> if (size % sizeof(struct jffs2_acl_entry_short))
> return -1;
> return size / sizeof(struct jffs2_acl_entry_short);
> } else {
> - s = size - 4 * sizeof(struct jffs2_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY
> + * sizeof(struct jffs2_acl_entry_short);
> if (s % sizeof(struct jffs2_acl_entry))
> return -1;
> - return s / sizeof(struct jffs2_acl_entry) + 4;
> + return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/fs/posix_acl.c b/fs/posix_acl.c
> index 8bd2135..15b1b0c 100644
> --- a/fs/posix_acl.c
> +++ b/fs/posix_acl.c
> @@ -72,6 +72,13 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
>
> /*
> * Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
> + *
> + * make sure ACL format is the following:
> + *
> + * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
> + *
> + * [1] Where * is the regexp sense of "0 or more times"
> + * [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
> */
> int
> posix_acl_valid(const struct posix_acl *acl)
> diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
> index f096b80..cb967a3 100644
> --- a/fs/reiserfs/acl.h
> +++ b/fs/reiserfs/acl.h
> @@ -20,13 +20,13 @@ typedef struct {
>
> static inline size_t reiserfs_acl_size(int count)
> {
> - if (count <= 4) {
> + if (count <= ACL_MAX_SHORT_ENTRY) {
> return sizeof(reiserfs_acl_header) +
> count * sizeof(reiserfs_acl_entry_short);
> } else {
> return sizeof(reiserfs_acl_header) +
> - 4 * sizeof(reiserfs_acl_entry_short) +
> - (count - 4) * sizeof(reiserfs_acl_entry);
> + ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
> + (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
> }
> }
>
> @@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
> {
> ssize_t s;
> size -= sizeof(reiserfs_acl_header);
> - s = size - 4 * sizeof(reiserfs_acl_entry_short);
> + s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
> if (s < 0) {
> if (size % sizeof(reiserfs_acl_entry_short))
> return -1;
> @@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
> } else {
> if (s % sizeof(reiserfs_acl_entry))
> return -1;
> - return s / sizeof(reiserfs_acl_entry) + 4;
> + return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> }
> }
>
> diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
> index 7931efe..2c5609c 100644
> --- a/include/linux/posix_acl.h
> +++ b/include/linux/posix_acl.h
> @@ -26,6 +26,14 @@
> #define ACL_MASK (0x10)
> #define ACL_OTHER (0x20)
>
> +/*
> + * posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> + * all of them are short. Otherwise exactly 4 entries are short ones and
> + * other have full length. See comment before that function for exact ACL
> + * format.
> + */
> +#define ACL_MAX_SHORT_ENTRY 4
> +
> /* permissions in the e_perm field */
> #define ACL_READ (0x04)
> #define ACL_WRITE (0x02)
>
--
Chen Gang
Asianux Corporation
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2013-01-20 7:02 ` Chen Gang
@ 2013-01-21 10:24 ` Jan Kara
-1 siblings, 0 replies; 23+ messages in thread
From: Jan Kara @ 2013-01-21 10:24 UTC (permalink / raw)
To: Chen Gang
Cc: Jan Kara, akpm, Theodore Ts'o, jaegeuk.kim, dwmw2, viro,
paul.gortmaker, ebiederm, adilger.kernel, torvalds, linux-ext4,
linux-f2fs-devel, linux-mtd, reiserfs-devel, linux-fsdevel
On Sun 20-01-13 15:02:46, Chen Gang wrote:
> Hello all:
>
> consult:
> excuse me, I wonder who is the final applier of this patch ?
> it seems too many relative members are in this mailing list.
> (it is why I also included torvalds@linux-foundation.org as 'THE REST')
>
> thanks.
>
> :-)
>
>
> by the way:
> originally, I send this mail by checking MAINTAINERS file, mannualy.
> and this time (now), I reply this mail by using scripts/get_maintainers.pl.
> (but still add torvalds@linux-foundation.org as 'THE REST')
Al Viro (you have him on CC list) is the right guy to merge this patch.
But he's not very responsive at times... You can also check whether he just
didn't silently merge your patch into his tree -
http://git.kernel.org/?p=linux/kernel/git/viro/vfs.git
I don't see the patch there right now, last update to the tree has
happened 3 weeks ago. Maybe he's on vacation...
Honza
> 于 2013年01月11日 16:58, Chen Gang 写道:
> >
> > give comments (by Theodore Ts'o)
> >
> > ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
> >
> > [1] Where * is the regexp sense of "0 or more times"
> > [2] ...
> >
> > give comments (by Jan Kara)
> > posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> > all of them are short. Otherwise exactly 4 entries are short ones and
> > other have full length. See comment before that function for exact ACL
> > format.
> > also correct the '[2]' comments:
> > [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
> >
> > use macro instead of hard code number (by Chen Gang)
> >
> > Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> > Signed-off-by: Jan Kara <jack@suse.cz>
> > Signed-off-by: Chen Gang <gang.chen@asianux.com>
> > ---
> > fs/ext2/acl.h | 10 +++++-----
> > fs/ext3/acl.h | 10 +++++-----
> > fs/ext4/acl.h | 10 +++++-----
> > fs/f2fs/acl.c | 12 +++++++-----
> > fs/jffs2/acl.c | 15 +++++++++------
> > fs/posix_acl.c | 7 +++++++
> > fs/reiserfs/acl.h | 10 +++++-----
> > include/linux/posix_acl.h | 8 ++++++++
> > 8 files changed, 51 insertions(+), 31 deletions(-)
> >
> > diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
> > index 503bfb0..9af79d0 100644
> > --- a/fs/ext2/acl.h
> > +++ b/fs/ext2/acl.h
> > @@ -25,13 +25,13 @@ typedef struct {
> >
> > static inline size_t ext2_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(ext2_acl_header) +
> > count * sizeof(ext2_acl_entry_short);
> > } else {
> > return sizeof(ext2_acl_header) +
> > - 4 * sizeof(ext2_acl_entry_short) +
> > - (count - 4) * sizeof(ext2_acl_entry);
> > + ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
> > + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
> > }
> > }
> >
> > @@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
> > {
> > ssize_t s;
> > size -= sizeof(ext2_acl_header);
> > - s = size - 4 * sizeof(ext2_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
> > if (s < 0) {
> > if (size % sizeof(ext2_acl_entry_short))
> > return -1;
> > @@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
> > } else {
> > if (s % sizeof(ext2_acl_entry))
> > return -1;
> > - return s / sizeof(ext2_acl_entry) + 4;
> > + return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
> > index dbc921e..b1cf2c0 100644
> > --- a/fs/ext3/acl.h
> > +++ b/fs/ext3/acl.h
> > @@ -25,13 +25,13 @@ typedef struct {
> >
> > static inline size_t ext3_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(ext3_acl_header) +
> > count * sizeof(ext3_acl_entry_short);
> > } else {
> > return sizeof(ext3_acl_header) +
> > - 4 * sizeof(ext3_acl_entry_short) +
> > - (count - 4) * sizeof(ext3_acl_entry);
> > + ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
> > + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
> > }
> > }
> >
> > @@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
> > {
> > ssize_t s;
> > size -= sizeof(ext3_acl_header);
> > - s = size - 4 * sizeof(ext3_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
> > if (s < 0) {
> > if (size % sizeof(ext3_acl_entry_short))
> > return -1;
> > @@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
> > } else {
> > if (s % sizeof(ext3_acl_entry))
> > return -1;
> > - return s / sizeof(ext3_acl_entry) + 4;
> > + return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
> > index 18cb39e..66d1fa3 100644
> > --- a/fs/ext4/acl.h
> > +++ b/fs/ext4/acl.h
> > @@ -25,13 +25,13 @@ typedef struct {
> >
> > static inline size_t ext4_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(ext4_acl_header) +
> > count * sizeof(ext4_acl_entry_short);
> > } else {
> > return sizeof(ext4_acl_header) +
> > - 4 * sizeof(ext4_acl_entry_short) +
> > - (count - 4) * sizeof(ext4_acl_entry);
> > + ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
> > + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
> > }
> > }
> >
> > @@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
> > {
> > ssize_t s;
> > size -= sizeof(ext4_acl_header);
> > - s = size - 4 * sizeof(ext4_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
> > if (s < 0) {
> > if (size % sizeof(ext4_acl_entry_short))
> > return -1;
> > @@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
> > } else {
> > if (s % sizeof(ext4_acl_entry))
> > return -1;
> > - return s / sizeof(ext4_acl_entry) + 4;
> > + return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
> > index 137af42..3e5a717 100644
> > --- a/fs/f2fs/acl.c
> > +++ b/fs/f2fs/acl.c
> > @@ -22,13 +22,15 @@
> >
> > static inline size_t f2fs_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(struct f2fs_acl_header) +
> > count * sizeof(struct f2fs_acl_entry_short);
> > } else {
> > return sizeof(struct f2fs_acl_header) +
> > - 4 * sizeof(struct f2fs_acl_entry_short) +
> > - (count - 4) * sizeof(struct f2fs_acl_entry);
> > + ACL_MAX_SHORT_ENTRY
> > + * sizeof(struct f2fs_acl_entry_short) +
> > + (count - ACL_MAX_SHORT_ENTRY)
> > + * sizeof(struct f2fs_acl_entry);
> > }
> > }
> >
> > @@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
> > {
> > ssize_t s;
> > size -= sizeof(struct f2fs_acl_header);
> > - s = size - 4 * sizeof(struct f2fs_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
> > if (s < 0) {
> > if (size % sizeof(struct f2fs_acl_entry_short))
> > return -1;
> > @@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
> > } else {
> > if (s % sizeof(struct f2fs_acl_entry))
> > return -1;
> > - return s / sizeof(struct f2fs_acl_entry) + 4;
> > + return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
> > index 223283c..48ef4b8 100644
> > --- a/fs/jffs2/acl.c
> > +++ b/fs/jffs2/acl.c
> > @@ -25,13 +25,15 @@
> >
> > static size_t jffs2_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(struct jffs2_acl_header)
> > + count * sizeof(struct jffs2_acl_entry_short);
> > } else {
> > return sizeof(struct jffs2_acl_header)
> > - + 4 * sizeof(struct jffs2_acl_entry_short)
> > - + (count - 4) * sizeof(struct jffs2_acl_entry);
> > + + ACL_MAX_SHORT_ENTRY
> > + * sizeof(struct jffs2_acl_entry_short)
> > + + (count - ACL_MAX_SHORT_ENTRY)
> > + * sizeof(struct jffs2_acl_entry);
> > }
> > }
> >
> > @@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
> > size_t s;
> >
> > size -= sizeof(struct jffs2_acl_header);
> > - if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
> > + if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
> > if (size % sizeof(struct jffs2_acl_entry_short))
> > return -1;
> > return size / sizeof(struct jffs2_acl_entry_short);
> > } else {
> > - s = size - 4 * sizeof(struct jffs2_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY
> > + * sizeof(struct jffs2_acl_entry_short);
> > if (s % sizeof(struct jffs2_acl_entry))
> > return -1;
> > - return s / sizeof(struct jffs2_acl_entry) + 4;
> > + return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/fs/posix_acl.c b/fs/posix_acl.c
> > index 8bd2135..15b1b0c 100644
> > --- a/fs/posix_acl.c
> > +++ b/fs/posix_acl.c
> > @@ -72,6 +72,13 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
> >
> > /*
> > * Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
> > + *
> > + * make sure ACL format is the following:
> > + *
> > + * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
> > + *
> > + * [1] Where * is the regexp sense of "0 or more times"
> > + * [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
> > */
> > int
> > posix_acl_valid(const struct posix_acl *acl)
> > diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
> > index f096b80..cb967a3 100644
> > --- a/fs/reiserfs/acl.h
> > +++ b/fs/reiserfs/acl.h
> > @@ -20,13 +20,13 @@ typedef struct {
> >
> > static inline size_t reiserfs_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(reiserfs_acl_header) +
> > count * sizeof(reiserfs_acl_entry_short);
> > } else {
> > return sizeof(reiserfs_acl_header) +
> > - 4 * sizeof(reiserfs_acl_entry_short) +
> > - (count - 4) * sizeof(reiserfs_acl_entry);
> > + ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
> > + (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
> > }
> > }
> >
> > @@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
> > {
> > ssize_t s;
> > size -= sizeof(reiserfs_acl_header);
> > - s = size - 4 * sizeof(reiserfs_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
> > if (s < 0) {
> > if (size % sizeof(reiserfs_acl_entry_short))
> > return -1;
> > @@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
> > } else {
> > if (s % sizeof(reiserfs_acl_entry))
> > return -1;
> > - return s / sizeof(reiserfs_acl_entry) + 4;
> > + return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
> > index 7931efe..2c5609c 100644
> > --- a/include/linux/posix_acl.h
> > +++ b/include/linux/posix_acl.h
> > @@ -26,6 +26,14 @@
> > #define ACL_MASK (0x10)
> > #define ACL_OTHER (0x20)
> >
> > +/*
> > + * posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> > + * all of them are short. Otherwise exactly 4 entries are short ones and
> > + * other have full length. See comment before that function for exact ACL
> > + * format.
> > + */
> > +#define ACL_MAX_SHORT_ENTRY 4
> > +
> > /* permissions in the e_perm field */
> > #define ACL_READ (0x04)
> > #define ACL_WRITE (0x02)
> >
>
>
> --
> Chen Gang
>
> Asianux Corporation
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2013-01-21 10:24 ` Jan Kara
0 siblings, 0 replies; 23+ messages in thread
From: Jan Kara @ 2013-01-21 10:24 UTC (permalink / raw)
To: Chen Gang
Cc: Theodore Ts'o, torvalds, reiserfs-devel, linux-f2fs-devel,
paul.gortmaker, adilger.kernel, viro, linux-mtd, jaegeuk.kim,
linux-fsdevel, Jan Kara, akpm, linux-ext4, dwmw2, ebiederm
On Sun 20-01-13 15:02:46, Chen Gang wrote:
> Hello all:
>
> consult:
> excuse me, I wonder who is the final applier of this patch ?
> it seems too many relative members are in this mailing list.
> (it is why I also included torvalds@linux-foundation.org as 'THE REST')
>
> thanks.
>
> :-)
>
>
> by the way:
> originally, I send this mail by checking MAINTAINERS file, mannualy.
> and this time (now), I reply this mail by using scripts/get_maintainers.pl.
> (but still add torvalds@linux-foundation.org as 'THE REST')
Al Viro (you have him on CC list) is the right guy to merge this patch.
But he's not very responsive at times... You can also check whether he just
didn't silently merge your patch into his tree -
http://git.kernel.org/?p=linux/kernel/git/viro/vfs.git
I don't see the patch there right now, last update to the tree has
happened 3 weeks ago. Maybe he's on vacation...
Honza
> 于 2013年01月11日 16:58, Chen Gang 写道:
> >
> > give comments (by Theodore Ts'o)
> >
> > ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
> >
> > [1] Where * is the regexp sense of "0 or more times"
> > [2] ...
> >
> > give comments (by Jan Kara)
> > posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> > all of them are short. Otherwise exactly 4 entries are short ones and
> > other have full length. See comment before that function for exact ACL
> > format.
> > also correct the '[2]' comments:
> > [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
> >
> > use macro instead of hard code number (by Chen Gang)
> >
> > Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> > Signed-off-by: Jan Kara <jack@suse.cz>
> > Signed-off-by: Chen Gang <gang.chen@asianux.com>
> > ---
> > fs/ext2/acl.h | 10 +++++-----
> > fs/ext3/acl.h | 10 +++++-----
> > fs/ext4/acl.h | 10 +++++-----
> > fs/f2fs/acl.c | 12 +++++++-----
> > fs/jffs2/acl.c | 15 +++++++++------
> > fs/posix_acl.c | 7 +++++++
> > fs/reiserfs/acl.h | 10 +++++-----
> > include/linux/posix_acl.h | 8 ++++++++
> > 8 files changed, 51 insertions(+), 31 deletions(-)
> >
> > diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
> > index 503bfb0..9af79d0 100644
> > --- a/fs/ext2/acl.h
> > +++ b/fs/ext2/acl.h
> > @@ -25,13 +25,13 @@ typedef struct {
> >
> > static inline size_t ext2_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(ext2_acl_header) +
> > count * sizeof(ext2_acl_entry_short);
> > } else {
> > return sizeof(ext2_acl_header) +
> > - 4 * sizeof(ext2_acl_entry_short) +
> > - (count - 4) * sizeof(ext2_acl_entry);
> > + ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short) +
> > + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext2_acl_entry);
> > }
> > }
> >
> > @@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size)
> > {
> > ssize_t s;
> > size -= sizeof(ext2_acl_header);
> > - s = size - 4 * sizeof(ext2_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext2_acl_entry_short);
> > if (s < 0) {
> > if (size % sizeof(ext2_acl_entry_short))
> > return -1;
> > @@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size)
> > } else {
> > if (s % sizeof(ext2_acl_entry))
> > return -1;
> > - return s / sizeof(ext2_acl_entry) + 4;
> > + return s / sizeof(ext2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
> > index dbc921e..b1cf2c0 100644
> > --- a/fs/ext3/acl.h
> > +++ b/fs/ext3/acl.h
> > @@ -25,13 +25,13 @@ typedef struct {
> >
> > static inline size_t ext3_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(ext3_acl_header) +
> > count * sizeof(ext3_acl_entry_short);
> > } else {
> > return sizeof(ext3_acl_header) +
> > - 4 * sizeof(ext3_acl_entry_short) +
> > - (count - 4) * sizeof(ext3_acl_entry);
> > + ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short) +
> > + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext3_acl_entry);
> > }
> > }
> >
> > @@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size)
> > {
> > ssize_t s;
> > size -= sizeof(ext3_acl_header);
> > - s = size - 4 * sizeof(ext3_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext3_acl_entry_short);
> > if (s < 0) {
> > if (size % sizeof(ext3_acl_entry_short))
> > return -1;
> > @@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size)
> > } else {
> > if (s % sizeof(ext3_acl_entry))
> > return -1;
> > - return s / sizeof(ext3_acl_entry) + 4;
> > + return s / sizeof(ext3_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
> > index 18cb39e..66d1fa3 100644
> > --- a/fs/ext4/acl.h
> > +++ b/fs/ext4/acl.h
> > @@ -25,13 +25,13 @@ typedef struct {
> >
> > static inline size_t ext4_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(ext4_acl_header) +
> > count * sizeof(ext4_acl_entry_short);
> > } else {
> > return sizeof(ext4_acl_header) +
> > - 4 * sizeof(ext4_acl_entry_short) +
> > - (count - 4) * sizeof(ext4_acl_entry);
> > + ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short) +
> > + (count - ACL_MAX_SHORT_ENTRY) * sizeof(ext4_acl_entry);
> > }
> > }
> >
> > @@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size)
> > {
> > ssize_t s;
> > size -= sizeof(ext4_acl_header);
> > - s = size - 4 * sizeof(ext4_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY * sizeof(ext4_acl_entry_short);
> > if (s < 0) {
> > if (size % sizeof(ext4_acl_entry_short))
> > return -1;
> > @@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size)
> > } else {
> > if (s % sizeof(ext4_acl_entry))
> > return -1;
> > - return s / sizeof(ext4_acl_entry) + 4;
> > + return s / sizeof(ext4_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
> > index 137af42..3e5a717 100644
> > --- a/fs/f2fs/acl.c
> > +++ b/fs/f2fs/acl.c
> > @@ -22,13 +22,15 @@
> >
> > static inline size_t f2fs_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(struct f2fs_acl_header) +
> > count * sizeof(struct f2fs_acl_entry_short);
> > } else {
> > return sizeof(struct f2fs_acl_header) +
> > - 4 * sizeof(struct f2fs_acl_entry_short) +
> > - (count - 4) * sizeof(struct f2fs_acl_entry);
> > + ACL_MAX_SHORT_ENTRY
> > + * sizeof(struct f2fs_acl_entry_short) +
> > + (count - ACL_MAX_SHORT_ENTRY)
> > + * sizeof(struct f2fs_acl_entry);
> > }
> > }
> >
> > @@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size)
> > {
> > ssize_t s;
> > size -= sizeof(struct f2fs_acl_header);
> > - s = size - 4 * sizeof(struct f2fs_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY * sizeof(struct f2fs_acl_entry_short);
> > if (s < 0) {
> > if (size % sizeof(struct f2fs_acl_entry_short))
> > return -1;
> > @@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size)
> > } else {
> > if (s % sizeof(struct f2fs_acl_entry))
> > return -1;
> > - return s / sizeof(struct f2fs_acl_entry) + 4;
> > + return s / sizeof(struct f2fs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
> > index 223283c..48ef4b8 100644
> > --- a/fs/jffs2/acl.c
> > +++ b/fs/jffs2/acl.c
> > @@ -25,13 +25,15 @@
> >
> > static size_t jffs2_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(struct jffs2_acl_header)
> > + count * sizeof(struct jffs2_acl_entry_short);
> > } else {
> > return sizeof(struct jffs2_acl_header)
> > - + 4 * sizeof(struct jffs2_acl_entry_short)
> > - + (count - 4) * sizeof(struct jffs2_acl_entry);
> > + + ACL_MAX_SHORT_ENTRY
> > + * sizeof(struct jffs2_acl_entry_short)
> > + + (count - ACL_MAX_SHORT_ENTRY)
> > + * sizeof(struct jffs2_acl_entry);
> > }
> > }
> >
> > @@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)
> > size_t s;
> >
> > size -= sizeof(struct jffs2_acl_header);
> > - if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
> > + if (size < ACL_MAX_SHORT_ENTRY * sizeof(struct jffs2_acl_entry_short)) {
> > if (size % sizeof(struct jffs2_acl_entry_short))
> > return -1;
> > return size / sizeof(struct jffs2_acl_entry_short);
> > } else {
> > - s = size - 4 * sizeof(struct jffs2_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY
> > + * sizeof(struct jffs2_acl_entry_short);
> > if (s % sizeof(struct jffs2_acl_entry))
> > return -1;
> > - return s / sizeof(struct jffs2_acl_entry) + 4;
> > + return s / sizeof(struct jffs2_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/fs/posix_acl.c b/fs/posix_acl.c
> > index 8bd2135..15b1b0c 100644
> > --- a/fs/posix_acl.c
> > +++ b/fs/posix_acl.c
> > @@ -72,6 +72,13 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
> >
> > /*
> > * Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
> > + *
> > + * make sure ACL format is the following:
> > + *
> > + * ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
> > + *
> > + * [1] Where * is the regexp sense of "0 or more times"
> > + * [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
> > */
> > int
> > posix_acl_valid(const struct posix_acl *acl)
> > diff --git a/fs/reiserfs/acl.h b/fs/reiserfs/acl.h
> > index f096b80..cb967a3 100644
> > --- a/fs/reiserfs/acl.h
> > +++ b/fs/reiserfs/acl.h
> > @@ -20,13 +20,13 @@ typedef struct {
> >
> > static inline size_t reiserfs_acl_size(int count)
> > {
> > - if (count <= 4) {
> > + if (count <= ACL_MAX_SHORT_ENTRY) {
> > return sizeof(reiserfs_acl_header) +
> > count * sizeof(reiserfs_acl_entry_short);
> > } else {
> > return sizeof(reiserfs_acl_header) +
> > - 4 * sizeof(reiserfs_acl_entry_short) +
> > - (count - 4) * sizeof(reiserfs_acl_entry);
> > + ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short) +
> > + (count - ACL_MAX_SHORT_ENTRY) * sizeof(reiserfs_acl_entry);
> > }
> > }
> >
> > @@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size)
> > {
> > ssize_t s;
> > size -= sizeof(reiserfs_acl_header);
> > - s = size - 4 * sizeof(reiserfs_acl_entry_short);
> > + s = size - ACL_MAX_SHORT_ENTRY * sizeof(reiserfs_acl_entry_short);
> > if (s < 0) {
> > if (size % sizeof(reiserfs_acl_entry_short))
> > return -1;
> > @@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size)
> > } else {
> > if (s % sizeof(reiserfs_acl_entry))
> > return -1;
> > - return s / sizeof(reiserfs_acl_entry) + 4;
> > + return s / sizeof(reiserfs_acl_entry) + ACL_MAX_SHORT_ENTRY;
> > }
> > }
> >
> > diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
> > index 7931efe..2c5609c 100644
> > --- a/include/linux/posix_acl.h
> > +++ b/include/linux/posix_acl.h
> > @@ -26,6 +26,14 @@
> > #define ACL_MASK (0x10)
> > #define ACL_OTHER (0x20)
> >
> > +/*
> > + * posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
> > + * all of them are short. Otherwise exactly 4 entries are short ones and
> > + * other have full length. See comment before that function for exact ACL
> > + * format.
> > + */
> > +#define ACL_MAX_SHORT_ENTRY 4
> > +
> > /* permissions in the e_perm field */
> > #define ACL_READ (0x04)
> > #define ACL_WRITE (0x02)
> >
>
>
> --
> Chen Gang
>
> Asianux Corporation
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2013-01-21 10:24 ` Jan Kara
@ 2013-01-21 10:40 ` Chen Gang
-1 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-21 10:40 UTC (permalink / raw)
To: Jan Kara
Cc: akpm, Theodore Ts'o, jaegeuk.kim, dwmw2, viro,
paul.gortmaker, ebiederm, adilger.kernel, torvalds, linux-ext4,
linux-f2fs-devel, linux-mtd, reiserfs-devel, linux-fsdevel
于 2013年01月21日 18:24, Jan Kara 写道:
> Al Viro (you have him on CC list) is the right guy to merge this patch.
> But he's not very responsive at times... You can also check whether he just
> didn't silently merge your patch into his tree -
> http://git.kernel.org/?p=linux/kernel/git/viro/vfs.git
> I don't see the patch there right now, last update to the tree has
> happened 3 weeks ago. Maybe he's on vacation...
thank you very much for your patient details replying.
sorry, it is my fault for my original mail address not including Viro
so it is necessary to wait additional week for getting his response.
next time, I need only use ./script/get_maintainers.pl to get mail address.
:-(
--
Chen Gang
Asianux Corporation
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2013-01-21 10:40 ` Chen Gang
0 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-21 10:40 UTC (permalink / raw)
To: Jan Kara
Cc: Theodore Ts'o, torvalds, reiserfs-devel, linux-f2fs-devel,
paul.gortmaker, adilger.kernel, viro, linux-mtd, linux-fsdevel,
jaegeuk.kim, akpm, linux-ext4, dwmw2, ebiederm
于 2013年01月21日 18:24, Jan Kara 写道:
> Al Viro (you have him on CC list) is the right guy to merge this patch.
> But he's not very responsive at times... You can also check whether he just
> didn't silently merge your patch into his tree -
> http://git.kernel.org/?p=linux/kernel/git/viro/vfs.git
> I don't see the patch there right now, last update to the tree has
> happened 3 weeks ago. Maybe he's on vacation...
thank you very much for your patient details replying.
sorry, it is my fault for my original mail address not including Viro
so it is necessary to wait additional week for getting his response.
next time, I need only use ./script/get_maintainers.pl to get mail address.
:-(
--
Chen Gang
Asianux Corporation
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2013-01-21 10:40 ` Chen Gang
@ 2013-01-29 8:24 ` Chen Gang
-1 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-29 8:24 UTC (permalink / raw)
To: viro
Cc: Jan Kara, akpm, Theodore Ts'o, jaegeuk.kim, dwmw2,
paul.gortmaker, ebiederm, adilger.kernel, torvalds, linux-ext4,
linux-f2fs-devel, linux-mtd, reiserfs-devel, linux-fsdevel
Hello Al Viro:
could you give a glance for this comment patch when you have time ?
(at least for me, most of comment patches are valuable for integrating)
thanks.
gchen.
于 2013年01月21日 18:40, Chen Gang 写道:
> 于 2013年01月21日 18:24, Jan Kara 写道:
>> Al Viro (you have him on CC list) is the right guy to merge this patch.
>> But he's not very responsive at times... You can also check whether he just
>> didn't silently merge your patch into his tree -
>> http://git.kernel.org/?p=linux/kernel/git/viro/vfs.git
>> I don't see the patch there right now, last update to the tree has
>> happened 3 weeks ago. Maybe he's on vacation...
>
> thank you very much for your patient details replying.
>
> sorry, it is my fault for my original mail address not including Viro
> so it is necessary to wait additional week for getting his response.
>
> next time, I need only use ./script/get_maintainers.pl to get mail address.
>
> :-(
>
>
--
Chen Gang
Asianux Corporation
--
To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2013-01-29 8:24 ` Chen Gang
0 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-01-29 8:24 UTC (permalink / raw)
To: viro
Cc: Theodore Ts'o, torvalds, reiserfs-devel, linux-f2fs-devel,
paul.gortmaker, adilger.kernel, ebiederm, linux-mtd, jaegeuk.kim,
linux-fsdevel, Jan Kara, akpm, linux-ext4, dwmw2
Hello Al Viro:
could you give a glance for this comment patch when you have time ?
(at least for me, most of comment patches are valuable for integrating)
thanks.
gchen.
于 2013年01月21日 18:40, Chen Gang 写道:
> 于 2013年01月21日 18:24, Jan Kara 写道:
>> Al Viro (you have him on CC list) is the right guy to merge this patch.
>> But he's not very responsive at times... You can also check whether he just
>> didn't silently merge your patch into his tree -
>> http://git.kernel.org/?p=linux/kernel/git/viro/vfs.git
>> I don't see the patch there right now, last update to the tree has
>> happened 3 weeks ago. Maybe he's on vacation...
>
> thank you very much for your patient details replying.
>
> sorry, it is my fault for my original mail address not including Viro
> so it is necessary to wait additional week for getting his response.
>
> next time, I need only use ./script/get_maintainers.pl to get mail address.
>
> :-(
>
>
--
Chen Gang
Asianux Corporation
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
2013-01-29 8:24 ` Chen Gang
@ 2013-02-02 5:10 ` Chen Gang
-1 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-02-02 5:10 UTC (permalink / raw)
To: viro
Cc: Jan Kara, akpm, Theodore Ts'o, jaegeuk.kim, dwmw2,
paul.gortmaker, ebiederm, adilger.kernel, torvalds, linux-ext4,
linux-f2fs-devel, linux-mtd, reiserfs-devel, linux-fsdevel
Hello Al Viro:
could you give a glance for this comment patch when you have time ?
I am so sorry for not including your mail address for this patch, originally
(it is really my fault, although the comment patch itself is innocence)
I should notice next time.
(and now, I always use ./script/get_maintainers.pl to get mail address)
maybe, the comment patch seems quite minor.
but at least for me, I think most of comment patches are not minor.
(in correct place, providing correct comments are not minor)
I also plan to provide more comment patches, in 2nd half of this year.
(if it seems not a good idea, please tell me, thanks)
if you have another opinions, welcome to discussion.
whether this patch will be applied or not, I still thank to relative members:
Theodore Ts'o: always give helpful responses at key point time.
(not only for this patch).
Jan Kara: provide more useful informations in action.
(not only for this patch).
thanks.
gchen.
于 2013年01月29日 16:24, Chen Gang 写道:
> Hello Al Viro:
>
> could you give a glance for this comment patch when you have time ?
>
> (at least for me, most of comment patches are valuable for integrating)
>
>
> thanks.
>
> gchen.
--
Chen Gang
Asianux Corporation
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v4] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
@ 2013-02-02 5:10 ` Chen Gang
0 siblings, 0 replies; 23+ messages in thread
From: Chen Gang @ 2013-02-02 5:10 UTC (permalink / raw)
To: viro
Cc: Theodore Ts'o, torvalds, reiserfs-devel, linux-f2fs-devel,
paul.gortmaker, adilger.kernel, ebiederm, linux-mtd, jaegeuk.kim,
linux-fsdevel, Jan Kara, akpm, linux-ext4, dwmw2
Hello Al Viro:
could you give a glance for this comment patch when you have time ?
I am so sorry for not including your mail address for this patch, originally
(it is really my fault, although the comment patch itself is innocence)
I should notice next time.
(and now, I always use ./script/get_maintainers.pl to get mail address)
maybe, the comment patch seems quite minor.
but at least for me, I think most of comment patches are not minor.
(in correct place, providing correct comments are not minor)
I also plan to provide more comment patches, in 2nd half of this year.
(if it seems not a good idea, please tell me, thanks)
if you have another opinions, welcome to discussion.
whether this patch will be applied or not, I still thank to relative members:
Theodore Ts'o: always give helpful responses at key point time.
(not only for this patch).
Jan Kara: provide more useful informations in action.
(not only for this patch).
thanks.
gchen.
于 2013年01月29日 16:24, Chen Gang 写道:
> Hello Al Viro:
>
> could you give a glance for this comment patch when you have time ?
>
> (at least for me, most of comment patches are valuable for integrating)
>
>
> thanks.
>
> gchen.
--
Chen Gang
Asianux Corporation
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2013-02-02 5:10 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-28 4:31 [PATCH] fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation Chen Gang
2012-12-31 15:45 ` Jan Kara
2012-12-31 15:45 ` Jan Kara
2013-01-04 3:04 ` [PATCH v2] " Chen Gang
2013-01-04 3:19 ` Chen Gang
2013-01-04 3:19 ` Chen Gang
2013-01-04 3:26 ` [PATCH v3] " Chen Gang
2013-01-07 19:20 ` Jan Kara
2013-01-07 19:20 ` Jan Kara
2013-01-08 2:02 ` Chen Gang
2013-01-08 2:02 ` Chen Gang
2013-01-11 8:58 ` [PATCH v4] " Chen Gang
2013-01-11 8:58 ` Chen Gang
2013-01-20 7:02 ` Chen Gang
2013-01-20 7:02 ` Chen Gang
2013-01-21 10:24 ` Jan Kara
2013-01-21 10:24 ` Jan Kara
2013-01-21 10:40 ` Chen Gang
2013-01-21 10:40 ` Chen Gang
2013-01-29 8:24 ` Chen Gang
2013-01-29 8:24 ` Chen Gang
2013-02-02 5:10 ` Chen Gang
2013-02-02 5:10 ` Chen Gang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.