udf: cleanups
cover udf: cleanups
Hi
This patchset contains various UDF fs cleanups.
[PATCH 01/10] udf: udf_CS0toUTF8 cleanup
[PATCH 02/10] udf: fix udf_build_ustr
[PATCH 03/10] udf: udf_CS0toNLS cleanup
[PATCH 04/10] udf: constify crc
[PATCH 05/10] udf: simple cleanup of truncate.c
[PATCH 06/10] udf: truncate: create function for updating of Allocation Ext Descriptor [PATCH 07/10] udf: replace all adds to little endians variables with le*_add_cpu [PATCH 08/10] udf: simplify __udf_read_inode
[PATCH 09/10] udf: replace udf_*_offset macros with functions
[PATCH 10/10] udf: constify udf_bitmap_lookup array
fs/udf/balloc.c | 13 +--- fs/udf/crc.c | 4 - fs/udf/ialloc.c | 12 +--- fs/udf/inode.c | 68 +++++++++--------------- fs/udf/super.c | 2 fs/udf/truncate.c | 132 ++++++++++++++++++++--------------------------- fs/udf/udfdecl.h | 33 +++++++---- fs/udf/unicode.c | 58 ++++++++------------ include/linux/udf_fs_i.h | 4 - 9 files changed, 142 insertions(+), 184 deletions(-)
This patchset depends on udf and byteorder patches (all in -mm).
Marcin Slusarz
PATCH 1/10 udf: udf_CS0toUTF8 cleanup
- fix error handling - always zero output variable
- don't zero explicitely fields zeroed by memset
- mark "in" paramater as const
- remove outdated comment
--- fs/udf/udfdecl.h | 2 +- fs/udf/unicode.c | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-)
fs/udf/udfdecl.h +1 -1
@@ -157,7 +157,7 @@ extern int udf_get_filename(struct super_block *, uint8_t *, uint8_t *, int);extern int udf_put_filename (struct super_block *,const uint8_t *,uint8_t *,int );extern int udf_build_ustr (struct ustr *,dstring *,int ); -extern int udf_CS0toUTF8 (struct ustr *,struct ustr *); +extern int udf_CS0toUTF8 (struct ustr *,const struct ustr *);/* ialloc.c */ extern void udf_free_inode (struct inode *);
fs/udf/unicode.c +10 -17
@@ -83,9 +83,6 @@ static int udf_build_ustr_exact(struct ustr *dest, dstring *ptr, int exactsize)* PURPOSE * Convert OSTA Compressed Unicode to the UTF-8 equivalent. * -* DESCRIPTION -* This routine is only called by udf_filldir(). -* * PRE-CONDITIONS * utf Pointer to UTF-8 output buffer. * ocu Pointer to OSTA Compressed Unicode input buffer
@@ -99,43 +96,39 @@ static int udf_build_ustr_exact(struct ustr *dest, dstring *ptr, int exactsize)* November 12, 1997 - Andrew E. Mileski * Written, tested, and released. */ -int udf_CS0toUTF8 (struct ustr *utf_o,struct ustr *ocu_i) +int udf_CS0toUTF8 (struct ustr *utf_o,const struct ustr *ocu_i) { -uint8_t *ocu; -uint32_t c; +const uint8_t *ocu;uint8_t cmp_id, ocu_len;int i; - ocu = ocu_i->u_name; - ocu_len = ocu_i->u_len; - cmp_id = ocu_i->u_cmpID; - utf_o->u_len =0 ; -if (ocu_len ==0 ) {memset (utf_o,0 ,sizeof (struct ustr )); - utf_o->u_cmpID =0 ; - utf_o->u_len =0 ;return 0 ; } -if ((cmp_id !=8 ) && (cmp_id !=16 )) { + cmp_id = ocu_i->u_cmpID; +if (cmp_id !=8 && cmp_id !=16 ) { +memset (utf_o,0 ,sizeof (struct ustr ));printk (KERN_ERR "udf: unknown compression code (%d) stri=%s\n" , cmp_id, ocu_i->u_name);return 0 ; } + ocu = ocu_i->u_name; + utf_o->u_len =0 ;for (i =0 ; (i < ocu_len) && (utf_o->u_len <= (UDF_NAME_LEN -3 ));) {/* Expand OSTA compressed Unicode to Unicode */ - c = ocu[i++]; +uint32_t c = ocu[i++];if (cmp_id ==16 ) c = (c <<8 ) | ocu[i++];/* Compress Unicode to UTF-8 */ -if (c <0x80U ) { +if (c <0x80U ) utf_o->u_name[utf_o->u_len++] = (uint8_t )c; - }else if (c <0x800U ) { +else if (c <0x800U ) { utf_o->u_name[utf_o->u_len++] = (uint8_t )(0xc0 | (c >>6 )); utf_o->u_name[utf_o->u_len++] =
Signature · 1 line
1.5.3.7
Re: [PATCH 01/10] udf: udf_CS0toUTF8 cleanup
Quoted 7 lines · On Wed 30-01-08 22:03:51, [email protected] wrote:
- fix error handling - always zero output variable
- don't zero explicitely fields zeroed by memset
- mark "in" paramater as const
- remove outdated commentSigned-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>
Honza
Quoted 89 lines
--- fs/udf/udfdecl.h | 2 +- fs/udf/unicode.c | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-)fs/udf/udfdecl.h +1
-1@@ -157,7 +157,7 @@ extern int udf_get_filename(struct super_block *, uint8_t *, uint8_t *, int);extern int udf_put_filename (struct super_block *,const uint8_t *,uint8_t *,int );extern int udf_build_ustr (struct ustr *,dstring *,int ); -extern int udf_CS0toUTF8 (struct ustr *,struct ustr *); +extern int udf_CS0toUTF8 (struct ustr *,const struct ustr *);/* ialloc.c */ extern void udf_free_inode (struct inode *);fs/udf/unicode.c +10
-17@@ -83,9 +83,6 @@ static int udf_build_ustr_exact(struct ustr *dest, dstring *ptr, int exactsize)* PURPOSE * Convert OSTA Compressed Unicode to the UTF-8 equivalent. * -* DESCRIPTION -* This routine is only called by udf_filldir(). -* * PRE-CONDITIONS * utf Pointer to UTF-8 output buffer. * ocu Pointer to OSTA Compressed Unicode input buffer @@ -99,43 +96,39 @@ static int udf_build_ustr_exact(struct ustr *dest, dstring *ptr, int exactsize)* November 12, 1997 - Andrew E. Mileski * Written, tested, and released. */ -int udf_CS0toUTF8 (struct ustr *utf_o,struct ustr *ocu_i) +int udf_CS0toUTF8 (struct ustr *utf_o,const struct ustr *ocu_i) { -uint8_t *ocu; -uint32_t c; +const uint8_t *ocu;uint8_t cmp_id, ocu_len;int i; - ocu = ocu_i->u_name; - ocu_len = ocu_i->u_len; - cmp_id = ocu_i->u_cmpID; - utf_o->u_len =0 ; -if (ocu_len ==0 ) {memset (utf_o,0 ,sizeof (struct ustr )); - utf_o->u_cmpID =0 ; - utf_o->u_len =0 ;return 0 ; } -if ((cmp_id !=8 ) && (cmp_id !=16 )) { + cmp_id = ocu_i->u_cmpID; +if (cmp_id !=8 && cmp_id !=16 ) { +memset (utf_o,0 ,sizeof (struct ustr ));printk (KERN_ERR "udf: unknown compression code (%d) stri=%s\n" , cmp_id, ocu_i->u_name);return 0 ; } + ocu = ocu_i->u_name; + utf_o->u_len =0 ;for (i =0 ; (i < ocu_len) && (utf_o->u_len <= (UDF_NAME_LEN -3 ));) {/* Expand OSTA compressed Unicode to Unicode */ - c = ocu[i++]; +uint32_t c = ocu[i++];if (cmp_id ==16 ) c = (c <<8 ) | ocu[i++];/* Compress Unicode to UTF-8 */ -if (c <0x80U ) { +if (c <0x80U ) utf_o->u_name[utf_o->u_len++] = (uint8_t )c; - }else if (c <0x800U ) { +else if (c <0x800U ) { utf_o->u_name[utf_o->u_len++] = (uint8_t )(0xc0 | (c >>6 )); utf_o->u_name[utf_o->u_len++] =Signature · 1 line
1.5.3.7
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH 2/10 udf: fix udf_build_ustr
In reply to [email protected]udf_build_ustr was completely broken when
size >= UDF_NAME_LEN - 1 or size < 2
nobody noticed because all callers set size
to acceptable values (constants)
--- fs/udf/unicode.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
fs/udf/unicode.c +6 -6
@@ -47,16 +47,16 @@ static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)*/ int udf_build_ustr (struct ustr *dest,dstring *ptr,int size) { -int usesize; +u8 usesize; -if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || size <2 )return -1 ; -memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, size -2 ,sizeof (dest->u_name)); dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);return 0 ; }
Signature · 1 line
1.5.3.7
Re: [PATCH 02/10] udf: fix udf_build_ustr
Quoted 17 lines · On Wed 30-01-08 22:03:52, [email protected] wrote:
udf_build_ustrwas completely broken when
size >=UDF_NAME_LEN- 1 or size < 2nobody noticed because all callers set size
to acceptable values (constants)Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>--- fs/udf/unicode.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)fs/udf/unicode.c +0
-0
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 50
Quoted 5 lines
fs/udf/unicode.c +1
-1@@ -47,16 +47,16 @@ static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)*/ int udf_build_ustr (struct ustr *dest,dstring *ptr,int size) { -int usesize; +u8 usesize;
What is the purpose for this? Why not just leave int there? Arithmetics
is usually best done in ints if that's possible...
Quoted 4 lines
fs/udf/unicode.c +1
-1-if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || size <2 )return -1 ;
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 59
Quoted 10 lines
fs/udf/unicode.c +4
-4-memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, size -2 ,sizeof (dest->u_name)); dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);
Hmm, after parsing what the standard says (ugh), I don't think the code is
wrong (at least I think you made it incorrect). The caller of udf_char_to_ustr() specifies length of the field (not length of the string). Now, in the last character of the field is stored the number of characters in the string and in the first character of the field is stored encoding of the string. So the original code seems correct.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 02/10] udf: fix udf_build_ustr
Quoted 13 lines · Jan Kara
Quoted 12 lines · On Wed 30-01-08 22:03:52, [email protected] wrote:
udf_build_ustrwas completely broken when
size >=UDF_NAME_LEN- 1 or size < 2nobody noticed because all callers set size
to acceptable values (constants)Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>--- fs/udf/unicode.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
Quoted 12 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 50
Quoted 10 lines
fs/udf/unicode.c +1
-1@@ -47,16 +47,16 @@ static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)*/ int udf_build_ustr (struct ustr *dest,dstring *ptr,int size) { -int usesize; +u8 usesize;What is the purpose for this? Why not just leave int there? Arithmetics
is usually best done in ints if that's possible...
I made it to stress that length of string fits in one byte. (struct ustr->u_len is uint8_t)
Quoted 4 lines
Quoted 4 lines
fs/udf/unicode.c +1
-1-if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || size <2 )return -1 ;
Quoted 15 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 58
Quoted 9 lines
fs/udf/unicode.c +4
-4-memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, size -2 ,sizeof (dest->u_name)); dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);Hmm, after parsing what the standard says (ugh), I don't think the code is
wrong (at least I think you made it incorrect). The caller ofudf_char_to_ustr()specifies length of the field (not length of the string). Now, in the last character of the field is stored the number of characters in the string and in the first character of the field is stored encoding of the string. So the original code seems correct.
You are right. I broke length calculation.
But observe that:
- when size == 1:
dest->u_len = ptr[1 - 1], but at ptr[0] there's cmpID, so we create string with wrong length
- when size > 1 and size < UDF_NAME_LEN:
we set u_len correctly, but memcpy copies one needless byte
- when size == UDF_NAME_LEN - 1:
memcpy overwrites u_len - with correct value, but...
- when size >= UDF_NAME_LEN:
we copy UDF_NAME_LEN - 1 bytes, but dest->u_name is array of UDF_NAME_LEN - 2 bytes, so we are overwriting u_len with character from input string
So if I didn't mess up someting, correct change would look like this:
---
udf: fix udf_build_ustr
udf_build_ustr was broken when
size >= UDF_NAME_LEN or size < 2
nobody noticed because all callers set size
to acceptable values (constants whitin range)
--- fs/udf/unicode.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
fs/udf/unicode.c +7 -6
@@ -47,16 +47,17 @@ static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)*/ int udf_build_ustr (struct ustr *dest,dstring *ptr,int size) { -int usesize; +u8 usesize; -if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || size <2 )return -1 ; -memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, ptr[size -1 ],sizeof (dest->u_name)); + usesize =min_t (size_t, usesize, size -2 ); dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);return 0 ; }
Signature · 1 line
1.5.3.7
Re: [PATCH 02/10] udf: fix udf_build_ustr
Quoted 26 lines · Marcin Slusarz
Quoted 13 lines · Jan Kara
Quoted 12 lines · On Wed 30-01-08 22:03:52, [email protected] wrote:
udf_build_ustrwas completely broken when
size >=UDF_NAME_LEN- 1 or size < 2nobody noticed because all callers set size
to acceptable values (constants)Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>--- fs/udf/unicode.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)Quoted 12 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 50
Quoted 10 lines
fs/udf/unicode.c +1
-1@@ -47,16 +47,16 @@ static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)*/ int udf_build_ustr (struct ustr *dest,dstring *ptr,int size) { -int usesize; +u8 usesize;What is the purpose for this? Why not just leave int there? Arithmetics
is usually best done in ints if that's possible...
Quoted 2 lines
I made it to stress that length of string fits in one byte. (struct
ustr->u_lenisuint8_t)
I see. I don't think this is really worthwhile, please keep int there.
Quoted 19 lines
Quoted 4 lines
Quoted 4 lines
fs/udf/unicode.c +1
-1-if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || size <2 )return -1 ;Quoted 15 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 60
Quoted 9 lines
fs/udf/unicode.c +4
-4-memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, size -2 ,sizeof (dest->u_name)); dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);Hmm, after parsing what the standard says (ugh), I don't think the code is
wrong (at least I think you made it incorrect). The caller ofudf_char_to_ustr()specifies length of the field (not length of the string). Now, in the last character of the field is stored the number of characters in the string and in the first character of the field is stored encoding of the string. So the original code seems correct.
Quoted 6 lines
You are right. I broke length calculation.
But observe that:
- when size == 1:dest->u_len = ptr[1 - 1], but at ptr[0] there's cmpID, so we create string with wrong length
Yes, but that never happens. This function should always be used for
fixed-length strings whose maximum length is defined in the standard so if someone calls it with size == 1, it is a bug. So you can just do BUG_ON(size < 2).
Quoted 4 lines
- when size > 1 and size <
UDF_NAME_LEN:
we setu_lencorrectly, but memcpy copies one needless byte
- when size ==UDF_NAME_LEN- 1:
memcpy overwritesu_len- with correct value, but...
Yes, you're right.
Quoted 4 lines
- when size >=
UDF_NAME_LEN:
we copyUDF_NAME_LEN- 1 bytes, butdest->u_nameis array ofUDF_NAME_LEN- 2 bytes, so we are overwritingu_lenwith character from input string
Again, this should not happen because UDF_NAME_LEN is large enough but
you are right it's better to clean this.
Quoted 21 lines
So if I didn't mess up someting, correct change would look like this:
---
udf: fixudf_build_ustr
udf_build_ustrwas broken when
size >=UDF_NAME_LENor size < 2nobody noticed because all callers set size
to acceptable values (constants whitin range)Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>--- fs/udf/unicode.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)fs/udf/unicode.c +0
-0
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 50
Quoted 5 lines
fs/udf/unicode.c +1
-1@@ -47,16 +47,17 @@ static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)*/ int udf_build_ustr (struct ustr *dest,dstring *ptr,int size) { -int usesize; +u8 usesize;
Just use int here..
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 56
Quoted 9 lines
fs/udf/unicode.c +3
-3-if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || size <2 )return -1 ; -memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, ptr[size -1 ],sizeof (dest->u_name)); + usesize =min_t (size_t, usesize, size -2 );
And here use just min() in both cases so that it's easier to read.
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 63
Quoted 9 lines
fs/udf/unicode.c +3
-2dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);return 0 ; }
Otherwise it looks fine. Thanks for the cleanups.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 02/10] udf: fix udf_build_ustr
Quoted 90 lines · Jan Kara
Quoted 26 lines · Marcin Slusarz
Quoted 13 lines · Jan Kara
Quoted 12 lines · On Wed 30-01-08 22:03:52, [email protected] wrote:
udf_build_ustrwas completely broken when
size >=UDF_NAME_LEN- 1 or size < 2nobody noticed because all callers set size
to acceptable values (constants)Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>--- fs/udf/unicode.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)Quoted 12 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 50
Quoted 10 lines
fs/udf/unicode.c +1
-1@@ -47,16 +47,16 @@ static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)*/ int udf_build_ustr (struct ustr *dest,dstring *ptr,int size) { -int usesize; +u8 usesize;What is the purpose for this? Why not just leave int there? Arithmetics
is usually best done in ints if that's possible...Quoted 2 lines
I made it to stress that length of string fits in one byte. (struct
ustr->u_lenisuint8_t)I see. I don't think this is really worthwhile, please keep int there.
Quoted 19 lines
Quoted 4 lines
Quoted 4 lines
fs/udf/unicode.c +1
-1-if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || size <2 )return -1 ;Quoted 15 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 58
Quoted 9 lines
fs/udf/unicode.c +4
-4-memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, size -2 ,sizeof (dest->u_name)); dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);Hmm, after parsing what the standard says (ugh), I don't think the code is
wrong (at least I think you made it incorrect). The caller ofudf_char_to_ustr()specifies length of the field (not length of the string). Now, in the last character of the field is stored the number of characters in the string and in the first character of the field is stored encoding of the string. So the original code seems correct.Quoted 6 lines
You are right. I broke length calculation.
But observe that:
- when size == 1:dest->u_len = ptr[1 - 1], but at ptr[0] there's cmpID, so we create string with wrong lengthYes, but that never happens. This function should always be used for
fixed-length strings whose maximum length is defined in the standard so if someone calls it with size == 1, it is a bug. So you can just doBUG_ON(size < 2).Quoted 4 lines
- when size > 1 and size <
UDF_NAME_LEN:
we setu_lencorrectly, but memcpy copies one needless byte
- when size ==UDF_NAME_LEN- 1:
memcpy overwritesu_len- with correct value, but...Yes, you're right.
Quoted 4 lines
- when size >=
UDF_NAME_LEN:
we copyUDF_NAME_LEN- 1 bytes, butdest->u_nameis array ofUDF_NAME_LEN- 2 bytes, so we are overwritingu_lenwith character from input stringAgain, this should not happen because
UDF_NAME_LENis large enough but
you are right it's better to clean this.Quoted 16 lines
So if I didn't mess up someting, correct change would look like this:
---
udf: fixudf_build_ustr
udf_build_ustrwas broken when
size >=UDF_NAME_LENor size < 2nobody noticed because all callers set size
to acceptable values (constants whitin range)Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>--- fs/udf/unicode.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
Quoted 11 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 50
Quoted 10 lines
fs/udf/unicode.c +1
-1@@ -47,16 +47,17 @@ static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)*/ int udf_build_ustr (struct ustr *dest,dstring *ptr,int size) { -int usesize; +u8 usesize;Just use int here..
Ok
Quoted 10 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 55
Quoted 9 lines
fs/udf/unicode.c +3
-3-if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || size <2 )return -1 ; -memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, ptr[size -1 ],sizeof (dest->u_name)); + usesize =min_t (size_t, usesize, size -2 );And here use just
min()in both cases so that it's easier to read.
I used min_t because gcc and sparse warned about different types.
Quoted 10 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 62
Quoted 9 lines
fs/udf/unicode.c +3
-2dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);return 0 ; }Otherwise it looks fine. Thanks for the cleanups.
Updated patch:
---
udf: fix udf_build_ustr
udf_build_ustr was broken:
- size == 1:
dest->u_len = ptr[1 - 1], but at ptr[0] there's cmpID, so we created string with wrong length
it should not happen, so we BUG() it
- size > 1 and size < UDF_NAME_LEN:
we set u_len correctly, but memcpy copied one needless byte
- size == UDF_NAME_LEN - 1:
memcpy overwrited u_len - with correct value, but...
- size >= UDF_NAME_LEN:
we copied UDF_NAME_LEN - 1 bytes, but dest->u_name is array of UDF_NAME_LEN - 2 bytes, so we were overwriting u_len with character from input string
nobody noticed because all callers set size
to acceptable values (constants whitin range)
--- fs/udf/unicode.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
fs/udf/unicode.c +7 -5
@@ -49,14 +49,16 @@ int udf_build_ustr(struct ustr *dest, dstring *ptr, int size) {int usesize; -if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || !size)return -1 ; +BUG_ON (size <2 ); -memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, ptr[size -1 ],sizeof (dest->u_name)); + usesize =min (usesize, size -2 ); dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);return 0 ; }
Signature · 1 line
1.5.3.7
Re: [PATCH 02/10] udf: fix udf_build_ustr
Quoted 171 lines · Marcin Slusarz
Quoted 90 lines · Jan Kara
Quoted 26 lines · Marcin Slusarz
Quoted 13 lines · Jan Kara
Quoted 12 lines · On Wed 30-01-08 22:03:52, [email protected] wrote:
udf_build_ustrwas completely broken when
size >=UDF_NAME_LEN- 1 or size < 2nobody noticed because all callers set size
to acceptable values (constants)Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>--- fs/udf/unicode.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)Quoted 12 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 50
Quoted 10 lines
fs/udf/unicode.c +1
-1@@ -47,16 +47,16 @@ static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)*/ int udf_build_ustr (struct ustr *dest,dstring *ptr,int size) { -int usesize; +u8 usesize;What is the purpose for this? Why not just leave int there? Arithmetics
is usually best done in ints if that's possible...Quoted 2 lines
I made it to stress that length of string fits in one byte. (struct
ustr->u_lenisuint8_t)I see. I don't think this is really worthwhile, please keep int there.
Quoted 19 lines
Quoted 4 lines
Quoted 4 lines
fs/udf/unicode.c +1
-1-if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || size <2 )return -1 ;Quoted 15 lines
fs/udf/unicode.c int udf_build_ustr(struct ustr *dest, dstring *ptr, int size) · line 61
Quoted 9 lines
fs/udf/unicode.c +4
-4-memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, size -2 ,sizeof (dest->u_name)); dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);Hmm, after parsing what the standard says (ugh), I don't think the code is
wrong (at least I think you made it incorrect). The caller ofudf_char_to_ustr()specifies length of the field (not length of the string). Now, in the last character of the field is stored the number of characters in the string and in the first character of the field is stored encoding of the string. So the original code seems correct.Quoted 6 lines
You are right. I broke length calculation.
But observe that:
- when size == 1:dest->u_len = ptr[1 - 1], but at ptr[0] there's cmpID, so we create string with wrong lengthYes, but that never happens. This function should always be used for
fixed-length strings whose maximum length is defined in the standard so if someone calls it with size == 1, it is a bug. So you can just doBUG_ON(size < 2).Quoted 4 lines
- when size > 1 and size <
UDF_NAME_LEN:
we setu_lencorrectly, but memcpy copies one needless byte
- when size ==UDF_NAME_LEN- 1:
memcpy overwritesu_len- with correct value, but...Yes, you're right.
Quoted 4 lines
- when size >=
UDF_NAME_LEN:
we copyUDF_NAME_LEN- 1 bytes, butdest->u_nameis array ofUDF_NAME_LEN- 2 bytes, so we are overwritingu_lenwith character from input stringAgain, this should not happen because
UDF_NAME_LENis large enough but
you are right it's better to clean this.Quoted 16 lines
So if I didn't mess up someting, correct change would look like this:
---
udf: fixudf_build_ustr
udf_build_ustrwas broken when
size >=UDF_NAME_LENor size < 2nobody noticed because all callers set size
to acceptable values (constants whitin range)Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>--- fs/udf/unicode.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)Quoted 11 lines
fs/udf/unicode.c static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen) · line 50
Quoted 10 lines
fs/udf/unicode.c +1
-1@@ -47,16 +47,17 @@ static int udf_char_to_ustr(struct ustr *dest, const uint8_t *src, int strlen)*/ int udf_build_ustr (struct ustr *dest,dstring *ptr,int size) { -int usesize; +u8 usesize;Just use int here..
Ok
Quoted 10 lines
fs/udf/unicode.c int udf_build_ustr(struct ustr *dest, dstring *ptr, int size)
Quoted 9 lines
fs/udf/unicode.c +3
-3-if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || size <2 )return -1 ; -memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, ptr[size -1 ],sizeof (dest->u_name)); + usesize =min_t (size_t, usesize, size -2 );And here use just
min()in both cases so that it's easier to read.I used
min_tbecause gcc and sparse warned about different types.Quoted 10 lines
fs/udf/unicode.c int udf_build_ustr(struct ustr *dest, dstring *ptr, int size) · line 64
Quoted 9 lines
fs/udf/unicode.c +3
-2dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);return 0 ; }Otherwise it looks fine. Thanks for the cleanups.
Updated patch:
---
udf: fixudf_build_ustr
udf_build_ustrwas broken:- size == 1:
dest->u_len= ptr[1 - 1], but at ptr[0] there's cmpID, so we created string with wrong length
it should not happen, so weBUG()it
- size > 1 and size <UDF_NAME_LEN:
we setu_lencorrectly, but memcpy copied one needless byte
- size ==UDF_NAME_LEN- 1:
memcpy overwritedu_len- with correct value, but...
- size >=UDF_NAME_LEN:
we copiedUDF_NAME_LEN- 1 bytes, butdest->u_nameis array ofUDF_NAME_LEN- 2 bytes, so we were overwritingu_lenwith character from input stringnobody noticed because all callers set size
to acceptable values (constants whitin range)Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>--- fs/udf/unicode.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)fs/udf/unicode.c +3
-3@@ -49,14 +49,16 @@ int udf_build_ustr(struct ustr *dest, dstring *ptr, int size) {int usesize; -if ((!dest) || (!ptr) || (!size)) +if (!dest || !ptr || !size)return -1 ; +BUG_ON (size <2 ); -memset (dest,0 ,sizeof (struct ustr )); - usesize = (size >UDF_NAME_LEN ) ?UDF_NAME_LEN : size; + usesize =min_t (size_t, ptr[size -1 ],sizeof (dest->u_name));
fs/udf/unicode.c int udf_build_ustr(struct ustr *dest, dstring *ptr, int size) · line 64
Quoted 10 lines
fs/udf/unicode.c +4
-2+ usesize =min (usesize, size -2 ); dest->u_cmpID = ptr[0 ]; - dest->u_len = ptr[size -1 ]; -memcpy (dest->u_name, ptr +1 , usesize -1 ); + dest->u_len = usesize; +memcpy (dest->u_name, ptr +1 , usesize); +memset (dest->u_name + usesize,0 ,sizeof (dest->u_name) - usesize);return 0 ; }
OK, fine, thanks. Acked-by: Jan Kara <[email protected]>
Honza
PS: I'm working on getting access to kernel.org so that I can run UDF git tree there so we try merging these patches with the new git when I set that up :).
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 02/10] udf: fix udf_build_ustr
Quoted 3 lines · Jan Kara
PS: I'm working on getting access to kernel.org so that I can run UDF git tree there so we try merging these patches with the new git when I set that up :).
Good to hear that :)
Marcin
PATCH 3/10 udf: udf_CS0toNLS cleanup
In reply to [email protected]- fix error handling - always zero output variable
- don't zero explicitely fields zeroed by memset
- mark "in" paramater as const
--- fs/udf/unicode.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-)
fs/udf/unicode.c +8 -11
@@ -248,35 +248,32 @@ error_out: }static int udf_CS0toNLS (struct nls_table *nls,struct ustr *utf_o, -struct ustr *ocu_i) +const struct ustr *ocu_i) { -uint8_t *ocu; -uint32_t c; +const uint8_t *ocu;uint8_t cmp_id, ocu_len;int i; - ocu = ocu_i->u_name; ocu_len = ocu_i->u_len; - cmp_id = ocu_i->u_cmpID; - utf_o->u_len =0 ; -if (ocu_len ==0 ) {memset (utf_o,0 ,sizeof (struct ustr )); - utf_o->u_cmpID =0 ; - utf_o->u_len =0 ;return 0 ; } -if ((cmp_id !=8 ) && (cmp_id !=16 )) { + cmp_id = ocu_i->u_cmpID; +if (cmp_id !=8 && cmp_id !=16 ) { +memset (utf_o,0 ,sizeof (struct ustr ));printk (KERN_ERR "udf: unknown compression code (%d) stri=%s\n" , cmp_id, ocu_i->u_name);return 0 ; } + ocu = ocu_i->u_name; + utf_o->u_len =0 ;for (i =0 ; (i < ocu_len) && (utf_o->u_len <= (UDF_NAME_LEN -3 ));) {/* Expand OSTA compressed Unicode to Unicode */ - c = ocu[i++]; +uint32_t c = ocu[i++];if (cmp_id ==16 ) c = (c <<8 ) | ocu[i++];
Signature · 1 line
1.5.3.7
Re: [PATCH 03/10] udf: udf_CS0toNLS cleanup
Quoted 6 lines · On Wed 30-01-08 22:03:53, [email protected] wrote:
- fix error handling - always zero output variable
- don't zero explicitely fields zeroed by memset
- mark "in" paramater as constSigned-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>
Honza
Quoted 55 lines
--- fs/udf/unicode.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-)fs/udf/unicode.c +8
-11@@ -248,35 +248,32 @@ error_out: }static int udf_CS0toNLS (struct nls_table *nls,struct ustr *utf_o, -struct ustr *ocu_i) +const struct ustr *ocu_i) { -uint8_t *ocu; -uint32_t c; +const uint8_t *ocu;uint8_t cmp_id, ocu_len;int i; - ocu = ocu_i->u_name; ocu_len = ocu_i->u_len; - cmp_id = ocu_i->u_cmpID; - utf_o->u_len =0 ; -if (ocu_len ==0 ) {memset (utf_o,0 ,sizeof (struct ustr )); - utf_o->u_cmpID =0 ; - utf_o->u_len =0 ;return 0 ; } -if ((cmp_id !=8 ) && (cmp_id !=16 )) { + cmp_id = ocu_i->u_cmpID; +if (cmp_id !=8 && cmp_id !=16 ) { +memset (utf_o,0 ,sizeof (struct ustr ));printk (KERN_ERR "udf: unknown compression code (%d) stri=%s\n" , cmp_id, ocu_i->u_name);return 0 ; } + ocu = ocu_i->u_name; + utf_o->u_len =0 ;for (i =0 ; (i < ocu_len) && (utf_o->u_len <= (UDF_NAME_LEN -3 ));) {/* Expand OSTA compressed Unicode to Unicode */ - c = ocu[i++]; +uint32_t c = ocu[i++];if (cmp_id ==16 ) c = (c <<8 ) | ocu[i++];Signature · 1 line
1.5.3.7
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH 4/10 udf: constify crc
In reply to [email protected]- constify internal crc table
- mark udf_crc "in" parameter as const
--- fs/udf/crc.c | 4 ++-- fs/udf/udfdecl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
fs/udf/crc.c +2 -2
@@ -23,7 +23,7 @@#include "udfdecl.h" -static uint16_t crc_table[256 ] = { +static const uint16_t crc_table[256 ] = {0x0000U ,0x1021U ,0x2042U ,0x3063U ,0x4084U ,0x50a5U ,0x60c6U ,0x70e7U ,0x8108U ,0x9129U ,0xa14aU ,0xb16bU ,0xc18cU ,0xd1adU ,0xe1ceU ,0xf1efU ,0x1231U ,0x0210U ,0x3273U ,0x2252U ,0x52b5U ,0x4294U ,0x72f7U ,0x62d6U ,
@@ -79,7 +79,7 @@ static uint16_t crc_table[256] = {* July 21, 1997 - Andrew E. Mileski * Adapted from OSTA-UDF(tm) 1.50 standard. */ -uint16_t udf_crc (uint8_t *data,uint32_t size,uint16_t crc) +uint16_t udf_crc (const uint8_t *data,uint32_t size,uint16_t crc) {while (size--) crc = crc_table[(crc >>8 ^ *(data++)) &0xffU ] ^ (crc <<8 );
fs/udf/udfdecl.h +1 -1
@@ -192,7 +192,7 @@ extern long_ad *udf_get_filelongad(uint8_t *, int, uint32_t *, int);extern short_ad *udf_get_fileshortad (uint8_t *,int ,uint32_t *,int );/* crc.c */ -extern uint16_t udf_crc (uint8_t *,uint32_t ,uint16_t ); +extern uint16_t udf_crc (const uint8_t *,uint32_t ,uint16_t );/* udftime.c */ extern time_t *udf_stamp_to_time (time_t *,long *,kernel_timestamp );
Signature · 1 line
1.5.3.7
Re: [PATCH 04/10] udf: constify crc
Quoted 2 lines · On Wed 30-01-08 22:03:54, [email protected] wrote:
- constify internal crc table
- markudf_crc"in" parameter as const
Honza
Quoted 46 lines
Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>--- fs/udf/crc.c | 4 ++-- fs/udf/udfdecl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)fs/udf/crc.c +2
-2@@ -23,7 +23,7 @@#include "udfdecl.h" -static uint16_t crc_table[256 ] = { +static const uint16_t crc_table[256 ] = {0x0000U ,0x1021U ,0x2042U ,0x3063U ,0x4084U ,0x50a5U ,0x60c6U ,0x70e7U ,0x8108U ,0x9129U ,0xa14aU ,0xb16bU ,0xc18cU ,0xd1adU ,0xe1ceU ,0xf1efU ,0x1231U ,0x0210U ,0x3273U ,0x2252U ,0x52b5U ,0x4294U ,0x72f7U ,0x62d6U ,@@ -79,7 +79,7 @@ static uint16_t crc_table[256] = {* July 21, 1997 - Andrew E. Mileski * Adapted from OSTA-UDF(tm) 1.50 standard. */ -uint16_t udf_crc (uint8_t *data,uint32_t size,uint16_t crc) +uint16_t udf_crc (const uint8_t *data,uint32_t size,uint16_t crc) {while (size--) crc = crc_table[(crc >>8 ^ *(data++)) &0xffU ] ^ (crc <<8 );fs/udf/udfdecl.h +1
-1@@ -192,7 +192,7 @@ extern long_ad *udf_get_filelongad(uint8_t *, int, uint32_t *, int);extern short_ad *udf_get_fileshortad (uint8_t *,int ,uint32_t *,int );/* crc.c */ -extern uint16_t udf_crc (uint8_t *,uint32_t ,uint16_t ); +extern uint16_t udf_crc (const uint8_t *,uint32_t ,uint16_t );/* udftime.c */ extern time_t *udf_stamp_to_time (time_t *,long *,kernel_timestamp );Signature · 1 line
1.5.3.7
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH 5/10 udf: simple cleanup of truncate.c
In reply to [email protected]- remove one indentation level by little code reorganization
- convert "if (smth) BUG();" to "BUG_ON(smth);"
--- fs/udf/truncate.c | 76 +++++++++++++++++++++++----------------------------- 1 files changed, 34 insertions(+), 42 deletions(-)
fs/udf/truncate.c +34 -42
@@ -224,34 +224,29 @@ void udf_truncate_extents(struct inode *inode)if (indirect_ext_len) {/* We managed to free all extents in the * indirect extent - free it too */ -if (!epos.bh) -BUG (); +BUG_ON (!epos.bh);udf_free_blocks (sb, inode, epos.block,0 , indirect_ext_len); + }else if (!epos.bh) { + iinfo->i_lenAlloc = lenalloc; +mark_inode_dirty (inode); }else { -if (!epos.bh) { - iinfo->i_lenAlloc = - lenalloc; -mark_inode_dirty (inode); - }else { -struct allocExtDesc *aed = - (struct allocExtDesc *) - (epos.bh->b_data); -int len = -sizeof (struct allocExtDesc ); +struct allocExtDesc *aed = + (struct allocExtDesc *) + (epos.bh->b_data); +int len =sizeof (struct allocExtDesc ); - aed->lengthAllocDescs = -cpu_to_le32 (lenalloc); -if (!UDF_QUERY_FLAG (sb, -UDF_FLAG_STRICT ) || - sbi->s_udfrev >=0x0201 ) - len += lenalloc; + aed->lengthAllocDescs = +cpu_to_le32 (lenalloc); +if (!UDF_QUERY_FLAG (sb, +UDF_FLAG_STRICT ) || + sbi->s_udfrev >=0x0201 ) + len += lenalloc; -udf_update_tag (epos.bh->b_data, - len); -mark_buffer_dirty_inode ( - epos.bh, inode); - } +udf_update_tag (epos.bh->b_data, + len); +mark_buffer_dirty_inode ( + epos.bh, inode); }brelse (epos.bh); epos.offset =sizeof (struct allocExtDesc );
@@ -272,28 +267,25 @@ void udf_truncate_extents(struct inode *inode) }if (indirect_ext_len) { -if (!epos.bh) -BUG (); +BUG_ON (!epos.bh);udf_free_blocks (sb, inode, epos.block,0 , indirect_ext_len); + }else if (!epos.bh) { + iinfo->i_lenAlloc = lenalloc; +mark_inode_dirty (inode); }else { -if (!epos.bh) { - iinfo->i_lenAlloc = lenalloc; -mark_inode_dirty (inode); - }else { -struct allocExtDesc *aed = - (struct allocExtDesc *)(epos.bh->b_data); - aed->lengthAllocDescs =cpu_to_le32 (lenalloc); -if (!UDF_QUERY_FLAG (sb,UDF_FLAG_STRICT ) || - sbi->s_udfrev >=0x0201 ) -udf_update_tag (epos.bh->b_data, - lenalloc + -sizeof (struct allocExtDesc )); -else -udf_update_tag (epos.bh->b_data, -sizeof (struct allocExtDesc )); -mark_buffer_dirty_inode (epos.bh, inode); - } +struct allocExtDesc *aed = + (struct allocExtDesc *)(epos.bh->b_data); + aed->lengthAllocDescs =cpu_to_le32 (lenalloc); +if (!UDF_QUERY_FLAG (sb,UDF_FLAG_STRICT ) || + sbi->s_udfrev >=0x0201 ) +udf_update_tag (epos.bh->b_data, + lenalloc + +sizeof (struct allocExtDesc )); +else +udf_update_tag (epos.bh->b_data, +sizeof (struct allocExtDesc )); +mark_buffer_dirty_inode (epos.bh, inode); } }else if (inode->i_size) {if (byte_offset) {
Signature · 1 line
1.5.3.7
Re: [PATCH 05/10] udf: simple cleanup of truncate.c
Quoted 5 lines · On Wed 30-01-08 22:03:55, [email protected] wrote:
- remove one indentation level by little code reorganization
- convert "if (smth)BUG();" to "BUG_ON(smth);"Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>
Honza
Quoted 109 lines
--- fs/udf/truncate.c | 76 +++++++++++++++++++++++----------------------------- 1 files changed, 34 insertions(+), 42 deletions(-)fs/udf/truncate.c +34
-42@@ -224,34 +224,29 @@ void udf_truncate_extents(struct inode *inode)if (indirect_ext_len) {/* We managed to free all extents in the * indirect extent - free it too */ -if (!epos.bh) -BUG (); +BUG_ON (!epos.bh);udf_free_blocks (sb, inode, epos.block,0 , indirect_ext_len); + }else if (!epos.bh) { + iinfo->i_lenAlloc = lenalloc; +mark_inode_dirty (inode); }else { -if (!epos.bh) { - iinfo->i_lenAlloc = - lenalloc; -mark_inode_dirty (inode); - }else { -struct allocExtDesc *aed = - (struct allocExtDesc *) - (epos.bh->b_data); -int len = -sizeof (struct allocExtDesc ); +struct allocExtDesc *aed = + (struct allocExtDesc *) + (epos.bh->b_data); +int len =sizeof (struct allocExtDesc ); - aed->lengthAllocDescs = -cpu_to_le32 (lenalloc); -if (!UDF_QUERY_FLAG (sb, -UDF_FLAG_STRICT ) || - sbi->s_udfrev >=0x0201 ) - len += lenalloc; + aed->lengthAllocDescs = +cpu_to_le32 (lenalloc); +if (!UDF_QUERY_FLAG (sb, +UDF_FLAG_STRICT ) || + sbi->s_udfrev >=0x0201 ) + len += lenalloc; -udf_update_tag (epos.bh->b_data, - len); -mark_buffer_dirty_inode ( - epos.bh, inode); - } +udf_update_tag (epos.bh->b_data, + len); +mark_buffer_dirty_inode ( + epos.bh, inode); }brelse (epos.bh); epos.offset =sizeof (struct allocExtDesc );@@ -272,28 +267,25 @@ void udf_truncate_extents(struct inode *inode) }if (indirect_ext_len) { -if (!epos.bh) -BUG (); +BUG_ON (!epos.bh);udf_free_blocks (sb, inode, epos.block,0 , indirect_ext_len); + }else if (!epos.bh) { + iinfo->i_lenAlloc = lenalloc; +mark_inode_dirty (inode); }else { -if (!epos.bh) { - iinfo->i_lenAlloc = lenalloc; -mark_inode_dirty (inode); - }else { -struct allocExtDesc *aed = - (struct allocExtDesc *)(epos.bh->b_data); - aed->lengthAllocDescs =cpu_to_le32 (lenalloc); -if (!UDF_QUERY_FLAG (sb,UDF_FLAG_STRICT ) || - sbi->s_udfrev >=0x0201 ) -udf_update_tag (epos.bh->b_data, - lenalloc + -sizeof (struct allocExtDesc )); -else -udf_update_tag (epos.bh->b_data, -sizeof (struct allocExtDesc )); -mark_buffer_dirty_inode (epos.bh, inode); - } +struct allocExtDesc *aed = + (struct allocExtDesc *)(epos.bh->b_data); + aed->lengthAllocDescs =cpu_to_le32 (lenalloc); +if (!UDF_QUERY_FLAG (sb,UDF_FLAG_STRICT ) || + sbi->s_udfrev >=0x0201 ) +udf_update_tag (epos.bh->b_data, + lenalloc + +sizeof (struct allocExtDesc )); +else +udf_update_tag (epos.bh->b_data, +sizeof (struct allocExtDesc )); +mark_buffer_dirty_inode (epos.bh, inode); } }else if (inode->i_size) {if (byte_offset) {Signature · 1 line
1.5.3.7
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH 6/10 udf: truncate: create function for updating of Allocation Ext Descriptor
In reply to [email protected]--- fs/udf/truncate.c | 56 +++++++++++++++++++++------------------------------- 1 files changed, 23 insertions(+), 33 deletions(-)
fs/udf/truncate.c +23 -33
@@ -180,6 +180,24 @@ void udf_discard_prealloc(struct inode *inode)brelse (epos.bh); } +static void udf_update_alloc_ext_desc (struct inode *inode, +struct extent_position *epos, +u32 lenalloc) +{ +struct super_block *sb = inode->i_sb; +struct udf_sb_info *sbi =UDF_SB (sb); + +struct allocExtDesc *aed = (struct allocExtDesc *) (epos->bh->b_data); +int len =sizeof (struct allocExtDesc ); + + aed->lengthAllocDescs =cpu_to_le32 (lenalloc); +if (!UDF_QUERY_FLAG (sb,UDF_FLAG_STRICT ) || sbi->s_udfrev >=0x0201 ) + len += lenalloc; + +udf_update_tag (epos->bh->b_data, len); +mark_buffer_dirty_inode (epos->bh, inode); +} +void udf_truncate_extents (struct inode *inode) {struct extent_position epos;
@@ -187,7 +205,6 @@ void udf_truncate_extents(struct inode *inode)uint32_t elen, nelen =0 , indirect_ext_len =0 , lenalloc;int8_t etype;struct super_block *sb = inode->i_sb; -struct udf_sb_info *sbi =UDF_SB (sb);sector_t first_block = inode->i_size >> sb->s_blocksize_bits, offset;loff_t byte_offset;int adsize;
@@ -230,24 +247,9 @@ void udf_truncate_extents(struct inode *inode) }else if (!epos.bh) { iinfo->i_lenAlloc = lenalloc;mark_inode_dirty (inode); - }else { -struct allocExtDesc *aed = - (struct allocExtDesc *) - (epos.bh->b_data); -int len =sizeof (struct allocExtDesc ); - - aed->lengthAllocDescs = -cpu_to_le32 (lenalloc); -if (!UDF_QUERY_FLAG (sb, -UDF_FLAG_STRICT ) || - sbi->s_udfrev >=0x0201 ) - len += lenalloc; - -udf_update_tag (epos.bh->b_data, - len); -mark_buffer_dirty_inode ( - epos.bh, inode); - } + }else +udf_update_alloc_ext_desc (inode, + &epos, lenalloc);brelse (epos.bh); epos.offset =sizeof (struct allocExtDesc ); epos.block = eloc;
@@ -273,20 +275,8 @@ void udf_truncate_extents(struct inode *inode) }else if (!epos.bh) { iinfo->i_lenAlloc = lenalloc;mark_inode_dirty (inode); - }else { -struct allocExtDesc *aed = - (struct allocExtDesc *)(epos.bh->b_data); - aed->lengthAllocDescs =cpu_to_le32 (lenalloc); -if (!UDF_QUERY_FLAG (sb,UDF_FLAG_STRICT ) || - sbi->s_udfrev >=0x0201 ) -udf_update_tag (epos.bh->b_data, - lenalloc + -sizeof (struct allocExtDesc )); -else -udf_update_tag (epos.bh->b_data, -sizeof (struct allocExtDesc )); -mark_buffer_dirty_inode (epos.bh, inode); - } + }else +udf_update_alloc_ext_desc (inode, &epos, lenalloc); }else if (inode->i_size) {if (byte_offset) {kernel_long_ad extent;
Signature · 1 line
1.5.3.7
Re: [PATCH 06/10] udf: truncate: create function for updating of Allocation Ext Descriptor
Quoted 2 lines · On Wed 30-01-08 22:03:56, [email protected] wrote:
Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>
There are at least a few other places in inode.c which do exactly what
you do in udf_update_alloc_ext_desc() so these should be converted as well. Moreover I think that we could move all the work with allocation extent descriptors into some helper functions but I have to think a bit (and also read the standard) how to do that best.
Honza
Quoted 95 lines
--- fs/udf/truncate.c | 56 +++++++++++++++++++++------------------------------- 1 files changed, 23 insertions(+), 33 deletions(-)fs/udf/truncate.c +23
-33@@ -180,6 +180,24 @@ void udf_discard_prealloc(struct inode *inode)brelse (epos.bh); } +static void udf_update_alloc_ext_desc (struct inode *inode, +struct extent_position *epos, +u32 lenalloc) +{ +struct super_block *sb = inode->i_sb; +struct udf_sb_info *sbi =UDF_SB (sb); + +struct allocExtDesc *aed = (struct allocExtDesc *) (epos->bh->b_data); +int len =sizeof (struct allocExtDesc ); + + aed->lengthAllocDescs =cpu_to_le32 (lenalloc); +if (!UDF_QUERY_FLAG (sb,UDF_FLAG_STRICT ) || sbi->s_udfrev >=0x0201 ) + len += lenalloc; + +udf_update_tag (epos->bh->b_data, len); +mark_buffer_dirty_inode (epos->bh, inode); +} +void udf_truncate_extents (struct inode *inode) {struct extent_position epos;@@ -187,7 +205,6 @@ void udf_truncate_extents(struct inode *inode)uint32_t elen, nelen =0 , indirect_ext_len =0 , lenalloc;int8_t etype;struct super_block *sb = inode->i_sb; -struct udf_sb_info *sbi =UDF_SB (sb);sector_t first_block = inode->i_size >> sb->s_blocksize_bits, offset;loff_t byte_offset;int adsize;@@ -230,24 +247,9 @@ void udf_truncate_extents(struct inode *inode) }else if (!epos.bh) { iinfo->i_lenAlloc = lenalloc;mark_inode_dirty (inode); - }else { -struct allocExtDesc *aed = - (struct allocExtDesc *) - (epos.bh->b_data); -int len =sizeof (struct allocExtDesc ); - - aed->lengthAllocDescs = -cpu_to_le32 (lenalloc); -if (!UDF_QUERY_FLAG (sb, -UDF_FLAG_STRICT ) || - sbi->s_udfrev >=0x0201 ) - len += lenalloc; - -udf_update_tag (epos.bh->b_data, - len); -mark_buffer_dirty_inode ( - epos.bh, inode); - } + }else +udf_update_alloc_ext_desc (inode, + &epos, lenalloc);brelse (epos.bh); epos.offset =sizeof (struct allocExtDesc ); epos.block = eloc;@@ -273,20 +275,8 @@ void udf_truncate_extents(struct inode *inode) }else if (!epos.bh) { iinfo->i_lenAlloc = lenalloc;mark_inode_dirty (inode); - }else { -struct allocExtDesc *aed = - (struct allocExtDesc *)(epos.bh->b_data); - aed->lengthAllocDescs =cpu_to_le32 (lenalloc); -if (!UDF_QUERY_FLAG (sb,UDF_FLAG_STRICT ) || - sbi->s_udfrev >=0x0201 ) -udf_update_tag (epos.bh->b_data, - lenalloc + -sizeof (struct allocExtDesc )); -else -udf_update_tag (epos.bh->b_data, -sizeof (struct allocExtDesc )); -mark_buffer_dirty_inode (epos.bh, inode); - } + }else +udf_update_alloc_ext_desc (inode, &epos, lenalloc); }else if (inode->i_size) {if (byte_offset) {kernel_long_ad extent;Signature · 1 line
1.5.3.7
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 06/10] udf: truncate: create function for updating of Allocation Ext Descriptor
Quoted 5 lines · Jan Kara
Quoted 2 lines · On Wed 30-01-08 22:03:56, [email protected] wrote:
Signed-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>There are at least a few other places in
inode.cwhich do exactly what
you do inudf_update_alloc_ext_desc()so these should be converted as well.
I noticed that too, but it's not clear to me how to do it properly.
Marcin
PATCH 7/10 udf: replace all adds to little endians variables with le*_add_cpu
In reply to [email protected]replace all:
little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) + expression_in_cpu_byteorder); with: leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder);
sparse didn't generate any new warning with this patch
--- fs/udf/balloc.c | 13 ++++--------- fs/udf/ialloc.c | 12 ++++-------- fs/udf/inode.c | 16 ++++------------ 3 files changed, 12 insertions(+), 29 deletions(-)
fs/udf/balloc.c +4 -9
@@ -149,8 +149,7 @@ static bool udf_add_free_space(struct udf_sb_info *sbi,return false; lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data; - lvid->freeSpaceTable[partition] =cpu_to_le32 (le32_to_cpu ( - lvid->freeSpaceTable[partition]) + cnt); +le32_add_cpu (&lvid->freeSpaceTable[partition], cnt);return true; }
@@ -589,10 +588,8 @@ static void udf_table_free_blocks(struct super_block *sb, sptr = oepos.bh->b_data + epos.offset; aed = (struct allocExtDesc *) oepos.bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu ( - aed->lengthAllocDescs) + - adsize); +le32_add_cpu (&aed->lengthAllocDescs, + adsize); }else { sptr = iinfo->i_ext.i_data + epos.offset;
@@ -645,9 +642,7 @@ static void udf_table_free_blocks(struct super_block *sb,mark_inode_dirty (table); }else { aed = (struct allocExtDesc *)epos.bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu ( - aed->lengthAllocDescs) + adsize); +le32_add_cpu (&aed->lengthAllocDescs, adsize);udf_update_tag (epos.bh->b_data, epos.offset);mark_buffer_dirty (epos.bh); }
fs/udf/ialloc.c +4 -8
@@ -47,11 +47,9 @@ void udf_free_inode(struct inode *inode)struct logicalVolIntegrityDescImpUse *lvidiu =udf_sb_lvidiu (sbi);if (S_ISDIR (inode->i_mode)) - lvidiu->numDirs = -cpu_to_le32 (le32_to_cpu (lvidiu->numDirs) -1 ); +le32_add_cpu (&lvidiu->numDirs,-1 );else - lvidiu->numFiles = -cpu_to_le32 (le32_to_cpu (lvidiu->numFiles) -1 ); +le32_add_cpu (&lvidiu->numFiles,-1 );mark_buffer_dirty (sbi->s_lvid_bh); }
@@ -105,11 +103,9 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) lvhd = (struct logicalVolHeaderDesc *) (lvid->logicalVolContentsUse);if (S_ISDIR (mode)) - lvidiu->numDirs = -cpu_to_le32 (le32_to_cpu (lvidiu->numDirs) +1 ); +le32_add_cpu (&lvidiu->numDirs,1 );else - lvidiu->numFiles = -cpu_to_le32 (le32_to_cpu (lvidiu->numFiles) +1 ); +le32_add_cpu (&lvidiu->numFiles,1 ); iinfo->i_unique = uniqueID =le64_to_cpu (lvhd->uniqueID);if (!(++uniqueID &0x00000000FFFFFFFFUL )) uniqueID +=16 ;
fs/udf/inode.c +4 -12
@@ -1778,9 +1778,7 @@ int8_t udf_add_aext(struct inode *inode, struct extent_position *epos,if (epos->bh) { aed = (struct allocExtDesc *)epos->bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu ( - aed->lengthAllocDescs) + adsize); +le32_add_cpu (&aed->lengthAllocDescs, adsize); }else { iinfo->i_lenAlloc += adsize;mark_inode_dirty (inode);
@@ -1830,9 +1828,7 @@ int8_t udf_add_aext(struct inode *inode, struct extent_position *epos,mark_inode_dirty (inode); }else { aed = (struct allocExtDesc *)epos->bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu (aed->lengthAllocDescs) + - adsize); +le32_add_cpu (&aed->lengthAllocDescs, adsize);if (!UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_STRICT ) ||UDF_SB (inode->i_sb)->s_udfrev >=0x0201 ) udf_update_tag(epos->bh->b_data,
@@ -2046,9 +2042,7 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos,mark_inode_dirty (inode); }else { aed = (struct allocExtDesc *)oepos.bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu (aed->lengthAllocDescs) - - (2 * adsize)); +le32_add_cpu (&aed->lengthAllocDescs, -(2 * adsize));if (!UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_STRICT ) ||UDF_SB (inode->i_sb)->s_udfrev >=0x0201 ) udf_update_tag(oepos.bh->b_data,
@@ -2065,9 +2059,7 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos,mark_inode_dirty (inode); }else { aed = (struct allocExtDesc *)oepos.bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu (aed->lengthAllocDescs) - - adsize); +le32_add_cpu (&aed->lengthAllocDescs, -adsize);if (!UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_STRICT ) ||UDF_SB (inode->i_sb)->s_udfrev >=0x0201 ) udf_update_tag(oepos.bh->b_data,
Signature · 1 line
1.5.3.7
Re: [PATCH 07/10] udf: replace all adds to little endians variables with le*_add_cpu
Quoted 9 lines · On Wed 30-01-08 22:03:57, [email protected] wrote:
replace all:
little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) + expression_in_cpu_byteorder); with: leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder);sparse didn't generate any new warning with this patch
Signed-off-by Marcin Slusarz <[email protected]Cc Jan Kara <[email protected]>
Honza
Quoted 127 lines
--- fs/udf/balloc.c | 13 ++++--------- fs/udf/ialloc.c | 12 ++++-------- fs/udf/inode.c | 16 ++++------------ 3 files changed, 12 insertions(+), 29 deletions(-)fs/udf/balloc.c +4
-9@@ -149,8 +149,7 @@ static bool udf_add_free_space(struct udf_sb_info *sbi,return false; lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data; - lvid->freeSpaceTable[partition] =cpu_to_le32 (le32_to_cpu ( - lvid->freeSpaceTable[partition]) + cnt); +le32_add_cpu (&lvid->freeSpaceTable[partition], cnt);return true; }@@ -589,10 +588,8 @@ static void udf_table_free_blocks(struct super_block *sb, sptr = oepos.bh->b_data + epos.offset; aed = (struct allocExtDesc *) oepos.bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu ( - aed->lengthAllocDescs) + - adsize); +le32_add_cpu (&aed->lengthAllocDescs, + adsize); }else { sptr = iinfo->i_ext.i_data + epos.offset;@@ -645,9 +642,7 @@ static void udf_table_free_blocks(struct super_block *sb,mark_inode_dirty (table); }else { aed = (struct allocExtDesc *)epos.bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu ( - aed->lengthAllocDescs) + adsize); +le32_add_cpu (&aed->lengthAllocDescs, adsize);udf_update_tag (epos.bh->b_data, epos.offset);mark_buffer_dirty (epos.bh); }fs/udf/ialloc.c +4
-8@@ -47,11 +47,9 @@ void udf_free_inode(struct inode *inode)struct logicalVolIntegrityDescImpUse *lvidiu =udf_sb_lvidiu (sbi);if (S_ISDIR (inode->i_mode)) - lvidiu->numDirs = -cpu_to_le32 (le32_to_cpu (lvidiu->numDirs) -1 ); +le32_add_cpu (&lvidiu->numDirs,-1 );else - lvidiu->numFiles = -cpu_to_le32 (le32_to_cpu (lvidiu->numFiles) -1 ); +le32_add_cpu (&lvidiu->numFiles,-1 );mark_buffer_dirty (sbi->s_lvid_bh); }@@ -105,11 +103,9 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) lvhd = (struct logicalVolHeaderDesc *) (lvid->logicalVolContentsUse);if (S_ISDIR (mode)) - lvidiu->numDirs = -cpu_to_le32 (le32_to_cpu (lvidiu->numDirs) +1 ); +le32_add_cpu (&lvidiu->numDirs,1 );else - lvidiu->numFiles = -cpu_to_le32 (le32_to_cpu (lvidiu->numFiles) +1 ); +le32_add_cpu (&lvidiu->numFiles,1 ); iinfo->i_unique = uniqueID =le64_to_cpu (lvhd->uniqueID);if (!(++uniqueID &0x00000000FFFFFFFFUL )) uniqueID +=16 ;fs/udf/inode.c +4
-12@@ -1778,9 +1778,7 @@ int8_t udf_add_aext(struct inode *inode, struct extent_position *epos,if (epos->bh) { aed = (struct allocExtDesc *)epos->bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu ( - aed->lengthAllocDescs) + adsize); +le32_add_cpu (&aed->lengthAllocDescs, adsize); }else { iinfo->i_lenAlloc += adsize;mark_inode_dirty (inode);@@ -1830,9 +1828,7 @@ int8_t udf_add_aext(struct inode *inode, struct extent_position *epos,mark_inode_dirty (inode); }else { aed = (struct allocExtDesc *)epos->bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu (aed->lengthAllocDescs) + - adsize); +le32_add_cpu (&aed->lengthAllocDescs, adsize);if (!UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_STRICT ) ||UDF_SB (inode->i_sb)->s_udfrev >=0x0201 ) udf_update_tag(epos->bh->b_data,@@ -2046,9 +2042,7 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos,mark_inode_dirty (inode); }else { aed = (struct allocExtDesc *)oepos.bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu (aed->lengthAllocDescs) - - (2 * adsize)); +le32_add_cpu (&aed->lengthAllocDescs, -(2 * adsize));if (!UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_STRICT ) ||UDF_SB (inode->i_sb)->s_udfrev >=0x0201 ) udf_update_tag(oepos.bh->b_data,@@ -2065,9 +2059,7 @@ int8_t udf_delete_aext(struct inode *inode, struct extent_position epos,mark_inode_dirty (inode); }else { aed = (struct allocExtDesc *)oepos.bh->b_data; - aed->lengthAllocDescs = -cpu_to_le32 (le32_to_cpu (aed->lengthAllocDescs) - - adsize); +le32_add_cpu (&aed->lengthAllocDescs, -adsize);if (!UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_STRICT ) ||UDF_SB (inode->i_sb)->s_udfrev >=0x0201 ) udf_update_tag(oepos.bh->b_data,Signature · 1 line
1.5.3.7
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH 8/10 udf: simplify __udf_read_inode
In reply to [email protected]- move all brelse(ibh) after main if, because it's called on every path except one where ibh is null
- move variables to the most inner blocks
--- fs/udf/inode.c | 52 +++++++++++++++++++++++----------------------------- 1 files changed, 23 insertions(+), 29 deletions(-)
fs/udf/inode.c +23 -29
@@ -1116,42 +1116,36 @@ static void __udf_read_inode(struct inode *inode) fe = (struct fileEntry *)bh->b_data;if (fe->icbTag.strategyType ==cpu_to_le16 (4096 )) { -struct buffer_head *ibh =NULL , *nbh =NULL ; -struct indirectEntry *ie; +struct buffer_head *ibh; ibh =udf_read_ptagged (inode->i_sb, iinfo->i_location,1 , &ident); -if (ident ==TAG_IDENT_IE ) { -if (ibh) { -kernel_lb_addr loc; - ie = (struct indirectEntry *)ibh->b_data; - - loc =lelb_to_cpu (ie->indirectICB.extLocation); - -if (ie->indirectICB.extLength && - (nbh =udf_read_ptagged (inode->i_sb, loc,0 , - &ident))) { -if (ident ==TAG_IDENT_FE || - ident ==TAG_IDENT_EFE ) { -memcpy (&iinfo->i_location, - &loc, -sizeof (kernel_lb_addr)); -brelse (bh); -brelse (ibh); -brelse (nbh); -__udf_read_inode (inode); -return ; - }else { -brelse (nbh); -brelse (ibh); - } - }else { +if (ident ==TAG_IDENT_IE && ibh) { +struct buffer_head *nbh =NULL ; +kernel_lb_addr loc; +struct indirectEntry *ie; + + ie = (struct indirectEntry *)ibh->b_data; + loc =lelb_to_cpu (ie->indirectICB.extLocation); + +if (ie->indirectICB.extLength && + (nbh =udf_read_ptagged (inode->i_sb, loc,0 , + &ident))) { +if (ident ==TAG_IDENT_FE || + ident ==TAG_IDENT_EFE ) { +memcpy (&iinfo->i_location, + &loc, +sizeof (kernel_lb_addr)); +brelse (bh);brelse (ibh); +brelse (nbh); +__udf_read_inode (inode); +return ; } +brelse (nbh); } - }else { -brelse (ibh); } +brelse (ibh); }else if (fe->icbTag.strategyType !=cpu_to_le16 (4 )) {printk (KERN_ERR "udf: unsupported strategy type: %d\n" ,le16_to_cpu (fe->icbTag.strategyType));
Signature · 1 line
1.5.3.7
Re: [PATCH 08/10] udf: simplify __udf_read_inode
Quoted 6 lines · On Wed 30-01-08 22:03:58, [email protected] wrote:
- move all brelse(ibh) after main if, because it's called on every path except one where ibh is null
- move variables to the most inner blocksSigned-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>
Honza
Quoted 77 lines
--- fs/udf/inode.c | 52 +++++++++++++++++++++++----------------------------- 1 files changed, 23 insertions(+), 29 deletions(-)fs/udf/inode.c +23
-29@@ -1116,42 +1116,36 @@ static void __udf_read_inode(struct inode *inode) fe = (struct fileEntry *)bh->b_data;if (fe->icbTag.strategyType ==cpu_to_le16 (4096 )) { -struct buffer_head *ibh =NULL , *nbh =NULL ; -struct indirectEntry *ie; +struct buffer_head *ibh; ibh =udf_read_ptagged (inode->i_sb, iinfo->i_location,1 , &ident); -if (ident ==TAG_IDENT_IE ) { -if (ibh) { -kernel_lb_addr loc; - ie = (struct indirectEntry *)ibh->b_data; - - loc =lelb_to_cpu (ie->indirectICB.extLocation); - -if (ie->indirectICB.extLength && - (nbh =udf_read_ptagged (inode->i_sb, loc,0 , - &ident))) { -if (ident ==TAG_IDENT_FE || - ident ==TAG_IDENT_EFE ) { -memcpy (&iinfo->i_location, - &loc, -sizeof (kernel_lb_addr)); -brelse (bh); -brelse (ibh); -brelse (nbh); -__udf_read_inode (inode); -return ; - }else { -brelse (nbh); -brelse (ibh); - } - }else { +if (ident ==TAG_IDENT_IE && ibh) { +struct buffer_head *nbh =NULL ; +kernel_lb_addr loc; +struct indirectEntry *ie; + + ie = (struct indirectEntry *)ibh->b_data; + loc =lelb_to_cpu (ie->indirectICB.extLocation); + +if (ie->indirectICB.extLength && + (nbh =udf_read_ptagged (inode->i_sb, loc,0 , + &ident))) { +if (ident ==TAG_IDENT_FE || + ident ==TAG_IDENT_EFE ) { +memcpy (&iinfo->i_location, + &loc, +sizeof (kernel_lb_addr)); +brelse (bh);brelse (ibh); +brelse (nbh); +__udf_read_inode (inode); +return ; } +brelse (nbh); } - }else { -brelse (ibh); } +brelse (ibh); }else if (fe->icbTag.strategyType !=cpu_to_le16 (4 )) {printk (KERN_ERR "udf: unsupported strategy type: %d\n" ,le16_to_cpu (fe->icbTag.strategyType));Signature · 1 line
1.5.3.7
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH 9/10 udf: replace udf_*_offset macros with functions
In reply to [email protected]- translate udf_file_entry_alloc_offset macro into function
- translate udf_ext0_offset macro into function
- add comment about crypticly named fields in struct udf_inode_info
--- fs/udf/udfdecl.h | 29 +++++++++++++++++++---------- include/linux/udf_fs_i.h | 4 ++-- 2 files changed, 21 insertions(+), 12 deletions(-)
fs/udf/udfdecl.h +19 -10
@@ -12,6 +12,7 @@#include <linux/buffer_head.h> #include "udfend.h" +#include "udf_i.h" #define udf_fixed_to_variable (x) ( ( ( (x) >> 5 ) * 39 ) + ( (x) & 0x0000001F ) )#define udf_variable_to_fixed (x) ( ( ( (x) / 39 ) << 5 ) + ( (x) % 39 ) )
@@ -23,16 +24,24 @@#define UDF_NAME_LEN 256#define UDF_PATH_LEN 1023 -#define udf_file_entry_alloc_offset (inode)\ - (UDF_I(inode)->i_use ?\ - sizeof(struct unallocSpaceEntry) :\ - ((UDF_I(inode)->i_efe ?\ - sizeof(struct extendedFileEntry) :\ - sizeof(struct fileEntry)) + UDF_I(inode)->i_lenEAttr)) - -#define udf_ext0_offset (inode)\ - (UDF_I(inode)->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB ?\ - udf_file_entry_alloc_offset(inode) : 0) +static inline size_t udf_file_entry_alloc_offset (struct inode *inode) +{ +struct udf_inode_info *iinfo =UDF_I (inode); +if (iinfo->i_use) +return sizeof (struct unallocSpaceEntry ); +else if (iinfo->i_efe) +return sizeof (struct extendedFileEntry ) + iinfo->i_lenEAttr; +else +return sizeof (struct fileEntry ) + iinfo->i_lenEAttr; +} + +static inline size_t udf_ext0_offset (struct inode *inode) +{ +if (UDF_I (inode)->i_alloc_type ==ICBTAG_FLAG_AD_IN_ICB ) +return udf_file_entry_alloc_offset (inode); +else +return 0 ; +}#define udf_get_lb_pblock (sb,loc,offset) udf_get_pblock((sb), (loc).logicalBlockNum, (loc).partitionReferenceNum, (offset))
include/linux/udf_fs_i.h +2 -2
@@ -27,8 +27,8 @@ struct udf_inode_info__u32 i_next_alloc_block;__u32 i_next_alloc_goal; unsigned i_alloc_type : 3; - unsigned i_efe : 1; - unsigned i_use : 1; + unsigned i_efe : 1; /* extendedFileEntry */ + unsigned i_use : 1; /* unallocSpaceEntry */ unsigned i_strat4096 : 1; unsigned reserved : 26; union
Signature · 1 line
1.5.3.7
Re: [PATCH 09/10] udf: replace udf_*_offset macros with functions
Quoted 6 lines · On Wed 30-01-08 22:03:59, [email protected] wrote:
- translate
udf_file_entry_alloc_offsetmacro into function
- translateudf_ext0_offsetmacro into function
- add comment about crypticly named fields in structudf_inode_infoSigned-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>
Honza
Quoted 70 lines
--- fs/udf/udfdecl.h | 29 +++++++++++++++++++---------- include/linux/udf_fs_i.h | 4 ++-- 2 files changed, 21 insertions(+), 12 deletions(-)fs/udf/udfdecl.h +19
-10@@ -12,6 +12,7 @@#include <linux/buffer_head.h> #include "udfend.h" +#include "udf_i.h" #define udf_fixed_to_variable (x) ( ( ( (x) >> 5 ) * 39 ) + ( (x) & 0x0000001F ) )#define udf_variable_to_fixed (x) ( ( ( (x) / 39 ) << 5 ) + ( (x) % 39 ) )@@ -23,16 +24,24 @@#define UDF_NAME_LEN 256#define UDF_PATH_LEN 1023 -#define udf_file_entry_alloc_offset (inode)\ - (UDF_I(inode)->i_use ?\ - sizeof(struct unallocSpaceEntry) :\ - ((UDF_I(inode)->i_efe ?\ - sizeof(struct extendedFileEntry) :\ - sizeof(struct fileEntry)) + UDF_I(inode)->i_lenEAttr)) - -#define udf_ext0_offset (inode)\ - (UDF_I(inode)->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB ?\ - udf_file_entry_alloc_offset(inode) : 0) +static inline size_t udf_file_entry_alloc_offset (struct inode *inode) +{ +struct udf_inode_info *iinfo =UDF_I (inode); +if (iinfo->i_use) +return sizeof (struct unallocSpaceEntry ); +else if (iinfo->i_efe) +return sizeof (struct extendedFileEntry ) + iinfo->i_lenEAttr; +else +return sizeof (struct fileEntry ) + iinfo->i_lenEAttr; +} + +static inline size_t udf_ext0_offset (struct inode *inode) +{ +if (UDF_I (inode)->i_alloc_type ==ICBTAG_FLAG_AD_IN_ICB ) +return udf_file_entry_alloc_offset (inode); +else +return 0 ; +}#define udf_get_lb_pblock (sb,loc,offset) udf_get_pblock((sb), (loc).logicalBlockNum, (loc).partitionReferenceNum, (offset))include/linux/udf_fs_i.h +2
-2@@ -27,8 +27,8 @@ struct udf_inode_info__u32 i_next_alloc_block;__u32 i_next_alloc_goal; unsigned i_alloc_type : 3; - unsigned i_efe : 1; - unsigned i_use : 1; + unsigned i_efe : 1; /* extendedFileEntry */ + unsigned i_use : 1; /* unallocSpaceEntry */ unsigned i_strat4096 : 1; unsigned reserved : 26; unionSignature · 1 line
1.5.3.7
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH 10/10 udf: constify udf_bitmap_lookup array
In reply to [email protected]udf_bitmap_lookup never changes, so constify it
--- fs/udf/super.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/udf/super.c +1 -1
@@ -1969,7 +1969,7 @@ static int udf_statfs(struct dentry *dentry, struct kstatfs *buf)return 0 ; } -static unsigned char udf_bitmap_lookup[16 ] = { +static const unsigned char udf_bitmap_lookup[16 ] = {0 ,1 ,1 ,2 ,1 ,2 ,2 ,3 ,1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 };
Signature · 1 line
1.5.3.7
Re: [PATCH 10/10] udf: constify udf_bitmap_lookup array
Quoted 4 lines · On Wed 30-01-08 22:04:00, [email protected] wrote:
udf_bitmap_lookupnever changes, so constify itSigned-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>
Hmm, rather than doing this, could you change the function to use
standard functions for counting set bits? I guess bitmap_weight() in include/linux/bitmap.h should be what we need... Thanks.
Honza
Quoted 20 lines
--- fs/udf/super.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)fs/udf/super.c +1
-1@@ -1969,7 +1969,7 @@ static int udf_statfs(struct dentry *dentry, struct kstatfs *buf)return 0 ; } -static unsigned char udf_bitmap_lookup[16 ] = { +static const unsigned char udf_bitmap_lookup[16 ] = {0 ,1 ,1 ,2 ,1 ,2 ,2 ,3 ,1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 };Signature · 1 line
1.5.3.7
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 10/10] udf: constify udf_bitmap_lookup array
Quoted 8 lines · Jan Kara
Quoted 4 lines · On Wed 30-01-08 22:04:00, [email protected] wrote:
udf_bitmap_lookupnever changes, so constify itSigned-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>Hmm, rather than doing this, could you change the function to use
standard functions for counting set bits? I guessbitmap_weight()ininclude/linux/bitmap.hshould be what we need... Thanks.
---
udf: convert udf_count_free_bitmap to use bitmap_weight
replace handwritten bits counting with bitmap_weight
--- fs/udf/super.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-)
fs/udf/super.c +5 -12
@@ -53,6 +53,7 @@#include <linux/vfs.h> #include <linux/vmalloc.h> #include <linux/errno.h> +#include <linux/bitmap.h> #include <asm/byteorder.h> #include <linux/udf_fs.h>
@@ -1969,10 +1970,6 @@ static int udf_statfs(struct dentry *dentry, struct kstatfs *buf)return 0 ; } -static unsigned char udf_bitmap_lookup[16 ] = { -0 ,1 ,1 ,2 ,1 ,2 ,2 ,3 ,1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 -}; -static unsigned int udf_count_free_bitmap (struct super_block *sb,struct udf_bitmap *bitmap) {
@@ -1982,7 +1979,6 @@ static unsigned int udf_count_free_bitmap(struct super_block *sb,int block =0 , newblock;kernel_lb_addr loc;uint32_t bytes; -uint8_t value;uint8_t *ptr;uint16_t ident;struct spaceBitmapDesc *bm;
@@ -2008,13 +2004,10 @@ static unsigned int udf_count_free_bitmap(struct super_block *sb, ptr = (uint8_t *)bh->b_data;while (bytes >0 ) { -while ((bytes >0 ) && (index < sb->s_blocksize)) { - value = ptr[index]; - accum += udf_bitmap_lookup[value &0x0f ]; - accum += udf_bitmap_lookup[value >>4 ]; - index++; - bytes--; - } +u32 cur_bytes =min_t (u32, bytes, sb->s_blocksize - index); + accum +=bitmap_weight ((const unsigned long *)(ptr + index), + cur_bytes *8 ); + bytes -= cur_bytes;if (bytes) {brelse (bh); newblock =udf_get_lb_pblock (sb, loc, ++block);
Signature · 1 line
1.5.3.7
Jan Kara
Acked-byRe: [PATCH 10/10] udf: constify udf_bitmap_lookup array
Quoted 10 lines · Marcin Slusarz
Quoted 8 lines · Jan Kara
Quoted 4 lines · On Wed 30-01-08 22:04:00, [email protected] wrote:
udf_bitmap_lookupnever changes, so constify itSigned-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>Hmm, rather than doing this, could you change the function to use
standard functions for counting set bits? I guessbitmap_weight()ininclude/linux/bitmap.hshould be what we need... Thanks.
Quoted 7 lines
---
udf: convertudf_count_free_bitmapto usebitmap_weightreplace handwritten bits counting with
bitmap_weightSigned-off-by Marcin Slusarz <[email protected]>Cc Jan Kara <[email protected]>
Honza
Quoted 56 lines
--- fs/udf/super.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-)fs/udf/super.c +5
-12@@ -53,6 +53,7 @@#include <linux/vfs.h> #include <linux/vmalloc.h> #include <linux/errno.h> +#include <linux/bitmap.h> #include <asm/byteorder.h> #include <linux/udf_fs.h> @@ -1969,10 +1970,6 @@ static int udf_statfs(struct dentry *dentry, struct kstatfs *buf)return 0 ; } -static unsigned char udf_bitmap_lookup[16 ] = { -0 ,1 ,1 ,2 ,1 ,2 ,2 ,3 ,1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 -}; -static unsigned int udf_count_free_bitmap (struct super_block *sb,struct udf_bitmap *bitmap) {@@ -1982,7 +1979,6 @@ static unsigned int udf_count_free_bitmap(struct super_block *sb,int block =0 , newblock;kernel_lb_addr loc;uint32_t bytes; -uint8_t value;uint8_t *ptr;uint16_t ident;struct spaceBitmapDesc *bm;@@ -2008,13 +2004,10 @@ static unsigned int udf_count_free_bitmap(struct super_block *sb, ptr = (uint8_t *)bh->b_data;while (bytes >0 ) { -while ((bytes >0 ) && (index < sb->s_blocksize)) { - value = ptr[index]; - accum += udf_bitmap_lookup[value &0x0f ]; - accum += udf_bitmap_lookup[value >>4 ]; - index++; - bytes--; - } +u32 cur_bytes =min_t (u32, bytes, sb->s_blocksize - index); + accum +=bitmap_weight ((const unsigned long *)(ptr + index), + cur_bytes *8 ); + bytes -= cur_bytes;if (bytes) {brelse (bh); newblock =udf_get_lb_pblock (sb, loc, ++block);Signature · 1 line
1.5.3.7
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR