patch add-ext4_es_store_pblock_status
Theodore Ts'o
maintainerPATCH 1/1 patch add-ext4_es_store_pblock_status
--- fs/ext4/extents_status.c | 15 +++++++-------- fs/ext4/extents_status.h | 9 +++++++++ 2 files changed, 16 insertions(+), 8 deletions(-)
fs/ext4/extents_status.c +7 -8
@@ -658,8 +658,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, newes.es_lblk = lblk; newes.es_len = len; -ext4_es_store_pblock (&newes, pblk); -ext4_es_store_status (&newes, status); +ext4_es_store_pblock_status (&newes, status, pblk);trace_ext4_es_insert_extent (inode, &newes);ext4_es_insert_extent_check (inode, &newes);
@@ -699,8 +698,7 @@ void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, newes.es_lblk = lblk; newes.es_len = len; -ext4_es_store_pblock (&newes, pblk); -ext4_es_store_status (&newes, status); +ext4_es_store_pblock_status (&newes, pblk, status);trace_ext4_es_cache_extent (inode, &newes);if (!len)
@@ -812,13 +810,14 @@ retry: newes.es_lblk = end +1 ; newes.es_len = len2; + block =0x7FDEADBEEF ;if (ext4_es_is_written (&orig_es) || -ext4_es_is_unwritten (&orig_es)) { +ext4_es_is_unwritten (&orig_es)) block =ext4_es_pblock (&orig_es) + orig_es.es_len - len2; -ext4_es_store_pblock (&newes, block); - } -ext4_es_store_status (&newes,ext4_es_status (&orig_es)); +ext4_es_store_pblock_status (&newes, +ext4_es_status (&orig_es), + block); err =__es_insert_extent (inode, &newes);if (err) { es->es_lblk = orig_es.es_lblk;
fs/ext4/extents_status.h +9 -0
@@ -129,6 +129,15 @@ static inline void ext4_es_store_status(struct extent_status *es, (es->es_pblk & ~ES_MASK)); } +static inline void ext4_es_store_pblock_status (struct extent_status *es, +ext4_fsblk_t pb, +unsigned int status) +{ + es->es_pblk = (((ext4_fsblk_t) + (status &EXTENT_STATUS_FLAGS ) <<ES_SHIFT ) | + (pb & ~ES_MASK )); +} +extern void ext4_es_register_shrinker (struct ext4_sb_info *sbi);extern void ext4_es_unregister_shrinker (struct ext4_sb_info *sbi);extern void ext4_es_lru_add (struct inode *inode);
Signature · 1 line
1.9.0
Quoted 1 line · Theodore Ts'o
---
A changelog would be helpful...
--D
Quoted 74 lines
fs/ext4/extents_status.c | 15 +++++++-------- fs/ext4/extents_status.h | 9 +++++++++ 2 files changed, 16 insertions(+), 8 deletions(-)fs/ext4/extents_status.c +7
-8@@ -658,8 +658,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, newes.es_lblk = lblk; newes.es_len = len; -ext4_es_store_pblock (&newes, pblk); -ext4_es_store_status (&newes, status); +ext4_es_store_pblock_status (&newes, status, pblk);trace_ext4_es_insert_extent (inode, &newes);ext4_es_insert_extent_check (inode, &newes);@@ -699,8 +698,7 @@ void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, newes.es_lblk = lblk; newes.es_len = len; -ext4_es_store_pblock (&newes, pblk); -ext4_es_store_status (&newes, status); +ext4_es_store_pblock_status (&newes, pblk, status);trace_ext4_es_cache_extent (inode, &newes);if (!len)@@ -812,13 +810,14 @@ retry: newes.es_lblk = end +1 ; newes.es_len = len2; + block =0x7FDEADBEEF ;if (ext4_es_is_written (&orig_es) || -ext4_es_is_unwritten (&orig_es)) { +ext4_es_is_unwritten (&orig_es)) block =ext4_es_pblock (&orig_es) + orig_es.es_len - len2; -ext4_es_store_pblock (&newes, block); - } -ext4_es_store_status (&newes,ext4_es_status (&orig_es)); +ext4_es_store_pblock_status (&newes, +ext4_es_status (&orig_es), + block); err =__es_insert_extent (inode, &newes);if (err) { es->es_lblk = orig_es.es_lblk;fs/ext4/extents_status.h +9
-0@@ -129,6 +129,15 @@ static inline void ext4_es_store_status(struct extent_status *es, (es->es_pblk & ~ES_MASK)); } +static inline void ext4_es_store_pblock_status (struct extent_status *es, +ext4_fsblk_t pb, +unsigned int status) +{ + es->es_pblk = (((ext4_fsblk_t) + (status &EXTENT_STATUS_FLAGS ) <<ES_SHIFT ) | + (pb & ~ES_MASK )); +} +extern void ext4_es_register_shrinker (struct ext4_sb_info *sbi);extern void ext4_es_unregister_shrinker (struct ext4_sb_info *sbi);extern void ext4_es_lru_add (struct inode *inode);Signature · 6 lines
1.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Theodore Ts'o
maintainerQuoted 4 lines · Darrick J. Wong
Quoted 1 line · Theodore Ts'o
---
A changelog would be helpful...
Whoops, I forgot to run "guilt refresh" before sending out the patch. Resending....
- Ted
Theodore Ts'o
maintainerPATCH 1/1 ext4: add ext4_es_store_pblock_status()
Avoid false positives by static code analysis tools such as sparse and coverity caused by the fact that we set the physical block, and then the status in the extent_status structure. It is also more efficient to set both of these values at once.
Addresses-Coverity-Id: #989077
Addresses-Coverity-Id: #989078
Addresses-Coverity-Id: #1080722
--- fs/ext4/extents_status.c | 15 +++++++-------- fs/ext4/extents_status.h | 9 +++++++++ 2 files changed, 16 insertions(+), 8 deletions(-)
fs/ext4/extents_status.c +7 -8
@@ -658,8 +658,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, newes.es_lblk = lblk; newes.es_len = len; -ext4_es_store_pblock (&newes, pblk); -ext4_es_store_status (&newes, status); +ext4_es_store_pblock_status (&newes, status, pblk);trace_ext4_es_insert_extent (inode, &newes);ext4_es_insert_extent_check (inode, &newes);
@@ -699,8 +698,7 @@ void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, newes.es_lblk = lblk; newes.es_len = len; -ext4_es_store_pblock (&newes, pblk); -ext4_es_store_status (&newes, status); +ext4_es_store_pblock_status (&newes, pblk, status);trace_ext4_es_cache_extent (inode, &newes);if (!len)
@@ -812,13 +810,14 @@ retry: newes.es_lblk = end +1 ; newes.es_len = len2; + block =0x7FDEADBEEF ;if (ext4_es_is_written (&orig_es) || -ext4_es_is_unwritten (&orig_es)) { +ext4_es_is_unwritten (&orig_es)) block =ext4_es_pblock (&orig_es) + orig_es.es_len - len2; -ext4_es_store_pblock (&newes, block); - } -ext4_es_store_status (&newes,ext4_es_status (&orig_es)); +ext4_es_store_pblock_status (&newes, +ext4_es_status (&orig_es), + block); err =__es_insert_extent (inode, &newes);if (err) { es->es_lblk = orig_es.es_lblk;
fs/ext4/extents_status.h +9 -0
@@ -129,6 +129,15 @@ static inline void ext4_es_store_status(struct extent_status *es, (es->es_pblk & ~ES_MASK)); } +static inline void ext4_es_store_pblock_status (struct extent_status *es, +ext4_fsblk_t pb, +unsigned int status) +{ + es->es_pblk = (((ext4_fsblk_t) + (status &EXTENT_STATUS_FLAGS ) <<ES_SHIFT ) | + (pb & ~ES_MASK )); +} +extern void ext4_es_register_shrinker (struct ext4_sb_info *sbi);extern void ext4_es_unregister_shrinker (struct ext4_sb_info *sbi);extern void ext4_es_lru_add (struct inode *inode);
Signature · 1 line
1.9.0
Theodore Ts'o
maintainerPATCH 1/1 ext4: add ext4_es_store_pblock_status()
Avoid false positives by static code analysis tools such as sparse and coverity caused by the fact that we set the physical block, and then the status in the extent_status structure. It is also more efficient to set both of these values at once.
Addresses-Coverity-Id: #989077
Addresses-Coverity-Id: #989078
Addresses-Coverity-Id: #1080722
--- fs/ext4/extents_status.c | 14 ++++++-------- fs/ext4/extents_status.h | 9 +++++++++ 2 files changed, 15 insertions(+), 8 deletions(-)
fs/ext4/extents_status.c +6 -8
@@ -658,8 +658,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, newes.es_lblk = lblk; newes.es_len = len; -ext4_es_store_pblock (&newes, pblk); -ext4_es_store_status (&newes, status); +ext4_es_store_pblock_status (&newes, pblk, status);trace_ext4_es_insert_extent (inode, &newes);ext4_es_insert_extent_check (inode, &newes);
@@ -699,8 +698,7 @@ void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, newes.es_lblk = lblk; newes.es_len = len; -ext4_es_store_pblock (&newes, pblk); -ext4_es_store_status (&newes, status); +ext4_es_store_pblock_status (&newes, pblk, status);trace_ext4_es_cache_extent (inode, &newes);if (!len)
@@ -812,13 +810,13 @@ retry: newes.es_lblk = end +1 ; newes.es_len = len2; + block =0x7FDEADBEEF ;if (ext4_es_is_written (&orig_es) || -ext4_es_is_unwritten (&orig_es)) { +ext4_es_is_unwritten (&orig_es)) block =ext4_es_pblock (&orig_es) + orig_es.es_len - len2; -ext4_es_store_pblock (&newes, block); - } -ext4_es_store_status (&newes,ext4_es_status (&orig_es)); +ext4_es_store_pblock_status (&newes, block, +ext4_es_status (&orig_es)); err =__es_insert_extent (inode, &newes);if (err) { es->es_lblk = orig_es.es_lblk;
fs/ext4/extents_status.h +9 -0
@@ -129,6 +129,15 @@ static inline void ext4_es_store_status(struct extent_status *es, (es->es_pblk & ~ES_MASK)); } +static inline void ext4_es_store_pblock_status (struct extent_status *es, +ext4_fsblk_t pb, +unsigned int status) +{ + es->es_pblk = (((ext4_fsblk_t) + (status &EXTENT_STATUS_FLAGS ) <<ES_SHIFT ) | + (pb & ~ES_MASK )); +} +extern void ext4_es_register_shrinker (struct ext4_sb_info *sbi);extern void ext4_es_unregister_shrinker (struct ext4_sb_info *sbi);extern void ext4_es_lru_add (struct inode *inode);
Signature · 1 line
1.9.0
Re: [PATCH -v3] ext4: add ext4_es_store_pblock_status()
Quoted 10 lines · Theodore Ts'o
Avoid false positives by static code analysis tools such as sparse and coverity caused by the fact that we set the physical block, and then the status in the
extent_statusstructure. It is also more efficient to set both of these values at once.Addresses-Coverity-Id: #989077
Addresses-Coverity-Id: #989078
Addresses-Coverity-Id: #1080722Signed-off-by "Theodore Ts'o" <[email protected]>
Thanks for fixing this. It looks good to me.
- Zheng
Quoted 74 lines
--- fs/ext4/extents_status.c | 14 ++++++-------- fs/ext4/extents_status.h | 9 +++++++++ 2 files changed, 15 insertions(+), 8 deletions(-)fs/ext4/extents_status.c +6
-8@@ -658,8 +658,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, newes.es_lblk = lblk; newes.es_len = len; -ext4_es_store_pblock (&newes, pblk); -ext4_es_store_status (&newes, status); +ext4_es_store_pblock_status (&newes, pblk, status);trace_ext4_es_insert_extent (inode, &newes);ext4_es_insert_extent_check (inode, &newes);@@ -699,8 +698,7 @@ void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, newes.es_lblk = lblk; newes.es_len = len; -ext4_es_store_pblock (&newes, pblk); -ext4_es_store_status (&newes, status); +ext4_es_store_pblock_status (&newes, pblk, status);trace_ext4_es_cache_extent (inode, &newes);if (!len)@@ -812,13 +810,13 @@ retry: newes.es_lblk = end +1 ; newes.es_len = len2; + block =0x7FDEADBEEF ;if (ext4_es_is_written (&orig_es) || -ext4_es_is_unwritten (&orig_es)) { +ext4_es_is_unwritten (&orig_es)) block =ext4_es_pblock (&orig_es) + orig_es.es_len - len2; -ext4_es_store_pblock (&newes, block); - } -ext4_es_store_status (&newes,ext4_es_status (&orig_es)); +ext4_es_store_pblock_status (&newes, block, +ext4_es_status (&orig_es)); err =__es_insert_extent (inode, &newes);if (err) { es->es_lblk = orig_es.es_lblk;fs/ext4/extents_status.h +9
-0@@ -129,6 +129,15 @@ static inline void ext4_es_store_status(struct extent_status *es, (es->es_pblk & ~ES_MASK)); } +static inline void ext4_es_store_pblock_status (struct extent_status *es, +ext4_fsblk_t pb, +unsigned int status) +{ + es->es_pblk = (((ext4_fsblk_t) + (status &EXTENT_STATUS_FLAGS ) <<ES_SHIFT ) | + (pb & ~ES_MASK )); +} +extern void ext4_es_register_shrinker (struct ext4_sb_info *sbi);extern void ext4_es_unregister_shrinker (struct ext4_sb_info *sbi);extern void ext4_es_lru_add (struct inode *inode);Signature · 6 lines
1.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html