projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
fs
/
f2fs
/
segment.h
diff --git
a/fs/f2fs/segment.h
b/fs/f2fs/segment.h
index
b33f73e
..
fecb856
100644
(file)
--- a/
fs/f2fs/segment.h
+++ b/
fs/f2fs/segment.h
@@
-479,7
+479,8
@@
static inline bool need_SSR(struct f2fs_sb_info *sbi)
reserved_sections(sbi) + 1);
}
reserved_sections(sbi) + 1);
}
-static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi, int freed)
+static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,
+ int freed, int needed)
{
int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);
int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);
{
int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);
int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);
@@
-489,8
+490,8
@@
static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi, int freed)
if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))
return false;
if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))
return false;
- return (free_sections(sbi) + freed) <=
(node_secs + 2 * dent_secs +
-
reserved_sections(sbi)
);
+ return (free_sections(sbi) + freed) <=
+
(node_secs + 2 * dent_secs + reserved_sections(sbi) + needed
);
}
static inline bool excess_prefree_segs(struct f2fs_sb_info *sbi)
}
static inline bool excess_prefree_segs(struct f2fs_sb_info *sbi)
@@
-587,8
+588,8
@@
static inline void check_seg_range(struct f2fs_sb_info *sbi, unsigned int segno)
static inline void verify_block_addr(struct f2fs_sb_info *sbi, block_t blk_addr)
{
static inline void verify_block_addr(struct f2fs_sb_info *sbi, block_t blk_addr)
{
-
f2fs_bug_on(sbi,
blk_addr < SEG0_BLKADDR(sbi)
-
|| blk_addr >= MAX_BLKADDR(sbi));
+
BUG_ON(
blk_addr < SEG0_BLKADDR(sbi)
+ || blk_addr >= MAX_BLKADDR(sbi));
}
/*
}
/*