Loading fs/f2fs/node.h +2 −3 Original line number Original line Diff line number Diff line Loading @@ -130,7 +130,7 @@ struct free_nid { int state; /* in use or not: NID_NEW or NID_ALLOC */ int state; /* in use or not: NID_NEW or NID_ALLOC */ }; }; static inline int next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid) static inline void next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid) { { struct f2fs_nm_info *nm_i = NM_I(sbi); struct f2fs_nm_info *nm_i = NM_I(sbi); struct free_nid *fnid; struct free_nid *fnid; Loading @@ -138,12 +138,11 @@ static inline int next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid) spin_lock(&nm_i->free_nid_list_lock); spin_lock(&nm_i->free_nid_list_lock); if (nm_i->fcnt <= 0) { if (nm_i->fcnt <= 0) { spin_unlock(&nm_i->free_nid_list_lock); spin_unlock(&nm_i->free_nid_list_lock); return -1; return; } } fnid = list_entry(nm_i->free_nid_list.next, struct free_nid, list); fnid = list_entry(nm_i->free_nid_list.next, struct free_nid, list); *nid = fnid->nid; *nid = fnid->nid; spin_unlock(&nm_i->free_nid_list_lock); spin_unlock(&nm_i->free_nid_list_lock); return 0; } } /* /* Loading Loading
fs/f2fs/node.h +2 −3 Original line number Original line Diff line number Diff line Loading @@ -130,7 +130,7 @@ struct free_nid { int state; /* in use or not: NID_NEW or NID_ALLOC */ int state; /* in use or not: NID_NEW or NID_ALLOC */ }; }; static inline int next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid) static inline void next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid) { { struct f2fs_nm_info *nm_i = NM_I(sbi); struct f2fs_nm_info *nm_i = NM_I(sbi); struct free_nid *fnid; struct free_nid *fnid; Loading @@ -138,12 +138,11 @@ static inline int next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid) spin_lock(&nm_i->free_nid_list_lock); spin_lock(&nm_i->free_nid_list_lock); if (nm_i->fcnt <= 0) { if (nm_i->fcnt <= 0) { spin_unlock(&nm_i->free_nid_list_lock); spin_unlock(&nm_i->free_nid_list_lock); return -1; return; } } fnid = list_entry(nm_i->free_nid_list.next, struct free_nid, list); fnid = list_entry(nm_i->free_nid_list.next, struct free_nid, list); *nid = fnid->nid; *nid = fnid->nid; spin_unlock(&nm_i->free_nid_list_lock); spin_unlock(&nm_i->free_nid_list_lock); return 0; } } /* /* Loading