|
@@ -208,7 +208,7 @@ struct free_segmap_info {
|
|
|
unsigned int start_segno; /* start segment number logically */
|
|
unsigned int start_segno; /* start segment number logically */
|
|
|
unsigned int free_segments; /* # of free segments */
|
|
unsigned int free_segments; /* # of free segments */
|
|
|
unsigned int free_sections; /* # of free sections */
|
|
unsigned int free_sections; /* # of free sections */
|
|
|
- rwlock_t segmap_lock; /* free segmap lock */
|
|
|
|
|
|
|
+ spinlock_t segmap_lock; /* free segmap lock */
|
|
|
unsigned long *free_segmap; /* free segment bitmap */
|
|
unsigned long *free_segmap; /* free segment bitmap */
|
|
|
unsigned long *free_secmap; /* free section bitmap */
|
|
unsigned long *free_secmap; /* free section bitmap */
|
|
|
};
|
|
};
|
|
@@ -319,9 +319,9 @@ static inline unsigned int find_next_inuse(struct free_segmap_info *free_i,
|
|
|
unsigned int max, unsigned int segno)
|
|
unsigned int max, unsigned int segno)
|
|
|
{
|
|
{
|
|
|
unsigned int ret;
|
|
unsigned int ret;
|
|
|
- read_lock(&free_i->segmap_lock);
|
|
|
|
|
|
|
+ spin_lock(&free_i->segmap_lock);
|
|
|
ret = find_next_bit(free_i->free_segmap, max, segno);
|
|
ret = find_next_bit(free_i->free_segmap, max, segno);
|
|
|
- read_unlock(&free_i->segmap_lock);
|
|
|
|
|
|
|
+ spin_unlock(&free_i->segmap_lock);
|
|
|
return ret;
|
|
return ret;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -332,7 +332,7 @@ static inline void __set_free(struct f2fs_sb_info *sbi, unsigned int segno)
|
|
|
unsigned int start_segno = secno * sbi->segs_per_sec;
|
|
unsigned int start_segno = secno * sbi->segs_per_sec;
|
|
|
unsigned int next;
|
|
unsigned int next;
|
|
|
|
|
|
|
|
- write_lock(&free_i->segmap_lock);
|
|
|
|
|
|
|
+ spin_lock(&free_i->segmap_lock);
|
|
|
clear_bit(segno, free_i->free_segmap);
|
|
clear_bit(segno, free_i->free_segmap);
|
|
|
free_i->free_segments++;
|
|
free_i->free_segments++;
|
|
|
|
|
|
|
@@ -341,7 +341,7 @@ static inline void __set_free(struct f2fs_sb_info *sbi, unsigned int segno)
|
|
|
clear_bit(secno, free_i->free_secmap);
|
|
clear_bit(secno, free_i->free_secmap);
|
|
|
free_i->free_sections++;
|
|
free_i->free_sections++;
|
|
|
}
|
|
}
|
|
|
- write_unlock(&free_i->segmap_lock);
|
|
|
|
|
|
|
+ spin_unlock(&free_i->segmap_lock);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static inline void __set_inuse(struct f2fs_sb_info *sbi,
|
|
static inline void __set_inuse(struct f2fs_sb_info *sbi,
|
|
@@ -363,7 +363,7 @@ static inline void __set_test_and_free(struct f2fs_sb_info *sbi,
|
|
|
unsigned int start_segno = secno * sbi->segs_per_sec;
|
|
unsigned int start_segno = secno * sbi->segs_per_sec;
|
|
|
unsigned int next;
|
|
unsigned int next;
|
|
|
|
|
|
|
|
- write_lock(&free_i->segmap_lock);
|
|
|
|
|
|
|
+ spin_lock(&free_i->segmap_lock);
|
|
|
if (test_and_clear_bit(segno, free_i->free_segmap)) {
|
|
if (test_and_clear_bit(segno, free_i->free_segmap)) {
|
|
|
free_i->free_segments++;
|
|
free_i->free_segments++;
|
|
|
|
|
|
|
@@ -374,7 +374,7 @@ static inline void __set_test_and_free(struct f2fs_sb_info *sbi,
|
|
|
free_i->free_sections++;
|
|
free_i->free_sections++;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- write_unlock(&free_i->segmap_lock);
|
|
|
|
|
|
|
+ spin_unlock(&free_i->segmap_lock);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static inline void __set_test_and_inuse(struct f2fs_sb_info *sbi,
|
|
static inline void __set_test_and_inuse(struct f2fs_sb_info *sbi,
|
|
@@ -382,13 +382,13 @@ static inline void __set_test_and_inuse(struct f2fs_sb_info *sbi,
|
|
|
{
|
|
{
|
|
|
struct free_segmap_info *free_i = FREE_I(sbi);
|
|
struct free_segmap_info *free_i = FREE_I(sbi);
|
|
|
unsigned int secno = segno / sbi->segs_per_sec;
|
|
unsigned int secno = segno / sbi->segs_per_sec;
|
|
|
- write_lock(&free_i->segmap_lock);
|
|
|
|
|
|
|
+ spin_lock(&free_i->segmap_lock);
|
|
|
if (!test_and_set_bit(segno, free_i->free_segmap)) {
|
|
if (!test_and_set_bit(segno, free_i->free_segmap)) {
|
|
|
free_i->free_segments--;
|
|
free_i->free_segments--;
|
|
|
if (!test_and_set_bit(secno, free_i->free_secmap))
|
|
if (!test_and_set_bit(secno, free_i->free_secmap))
|
|
|
free_i->free_sections--;
|
|
free_i->free_sections--;
|
|
|
}
|
|
}
|
|
|
- write_unlock(&free_i->segmap_lock);
|
|
|
|
|
|
|
+ spin_unlock(&free_i->segmap_lock);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static inline void get_sit_bitmap(struct f2fs_sb_info *sbi,
|
|
static inline void get_sit_bitmap(struct f2fs_sb_info *sbi,
|