Skip to contentSkip to conversation

btrfs: make unpin_extent_cache return void

PATCH In review [email protected] 2 participants 2 messages Jun 14, 2023 1 message not in the archive Btrfs file system

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 btrfs: make unpin_extent_cache return void

The return value of unpin_extent_cache is always 0, and its caller does not check its return value.

---
 fs/btrfs/extent_map.c | 3 +--
 fs/btrfs/extent_map.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
fs/btrfs/extent_map.c +0 -0
index f3e9aaeb9956..845994b47998 100644
@@ -292,7 +292,7 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em)
  * to the generation that actually added the file item to the inode so 

we know
* we need to sync this extent when we call fsync().
*/
-int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len, +void unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len,

                u64 gen)
 {
     struct extent_map *em;
@@ -326,7 +326,6 @@ int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len,
     free_extent_map(em);
 out:
     write_unlock(&tree->lock);

- return 0;

}

fs/btrfs/extent_map.h +1 -1
index 35d27c756e08..486a8ea798c7 100644
@@ -97,7 +97,7 @@ struct extent_map *alloc_extent_map(void);
 void free_extent_map(struct extent_map *em);
 int __init extent_map_init(void);
 void __cold extent_map_exit(void);
-int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len, u64 gen);
+void unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len, u64 gen);
 void clear_em_logging(struct extent_map_tree *tree, struct extent_map 

*em);
struct extent_map *search_extent_mapping(struct extent_map_tree *tree,

                      u64 start, u64 len);
Reviewed-by on v1 1/1
#2 lore raw
Quoted 4 lines · On 2023/6/14 15:29, [email protected] wrote:

The return value of unpin_extent_cache is always 0, and its caller does not check its return value.

Thanks,
Qu

Quoted 45 lines
---
  fs/btrfs/extent_map.c | 3 +--
  fs/btrfs/extent_map.h | 2 +-
  2 files changed, 2 insertions(+), 3 deletions(-)
fs/btrfs/extent_map.c +0 -0
index f3e9aaeb9956..845994b47998 100644
@@ -292,7 +292,7 @@ static void try_merge_map(struct extent_map_tree
 *tree, struct extent_map *em)
   * to the generation that actually added the file item to the inode so

we know
  * we need to sync this extent when we call fsync(). */

fs/btrfs/extent_map.c +1 -2
-int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len,
+void unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len,
                 u64 gen)
  {
      struct extent_map *em;
@@ -326,7 +326,6 @@ int unpin_extent_cache(struct extent_map_tree *tree,
 u64 start, u64 len,
      free_extent_map(em);
  out:
      write_unlock(&tree->lock);
-    return 0;
 
  }
fs/btrfs/extent_map.h +1 -1
index 35d27c756e08..486a8ea798c7 100644
@@ -97,7 +97,7 @@ struct extent_map *alloc_extent_map(void);
  void free_extent_map(struct extent_map *em);
  int __init extent_map_init(void);
  void __cold extent_map_exit(void);
-int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64
 len, u64 gen);
+void unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64
 len, u64 gen);
  void clear_em_logging(struct extent_map_tree *tree, struct extent_map

*em);
 struct extent_map *search_extent_mapping(struct extent_map_tree *tree, u64 start, u64 len);