Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 746103ac authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBIFS: inline one-line functions 



'ubifs_get_lprops()' and 'ubifs_release_lprops()' basically wrap
mutex lock and unlock. We have them because we want lprops subsystem
be separate and as independent as possible. And we planned better
locking rules for lprops.

Anyway, because they are short, it is better to inline them.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 8d47aef4

fs/ubifs/lprops.c

+0 −28
Original line number Diff line number Diff line
@@ -460,18 +460,6 @@ static void change_category(struct ubifs_info *c, struct ubifs_lprops *lprops) 
	}

}



/**

 * ubifs_get_lprops - get reference to LEB properties.

 * @c: the UBIFS file-system description object

 *

 * This function locks lprops. Lprops have to be unlocked by

 * 'ubifs_release_lprops()'.

 */

void ubifs_get_lprops(struct ubifs_info *c)

{

	mutex_lock(&c->lp_mutex);

}



/**

 * calc_dark - calculate LEB dark space size.

 * @c: the UBIFS file-system description object
@@ -642,22 +630,6 @@ const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c, 
	return lprops;

}



/**

 * ubifs_release_lprops - release lprops lock.

 * @c: the UBIFS file-system description object

 *

 * This function has to be called after each 'ubifs_get_lprops()' call to

 * unlock lprops.

 */

void ubifs_release_lprops(struct ubifs_info *c)

{

	ubifs_assert(mutex_is_locked(&c->lp_mutex));

	ubifs_assert(c->lst.empty_lebs >= 0 &&

		     c->lst.empty_lebs <= c->main_lebs);



	mutex_unlock(&c->lp_mutex);

}



/**

 * ubifs_get_lp_stats - get lprops statistics.

 * @c: UBIFS file-system description object

fs/ubifs/misc.h

+27 −0
Original line number Diff line number Diff line
@@ -310,4 +310,31 @@ static inline int ubifs_tnc_lookup(struct ubifs_info *c, 
	return ubifs_tnc_locate(c, key, node, NULL, NULL);

}



/**

 * ubifs_get_lprops - get reference to LEB properties.

 * @c: the UBIFS file-system description object

 *

 * This function locks lprops. Lprops have to be unlocked by

 * 'ubifs_release_lprops()'.

 */

static inline void ubifs_get_lprops(struct ubifs_info *c)

{

	mutex_lock(&c->lp_mutex);

}



/**

 * ubifs_release_lprops - release lprops lock.

 * @c: the UBIFS file-system description object

 *

 * This function has to be called after each 'ubifs_get_lprops()' call to

 * unlock lprops.

 */

static inline void ubifs_release_lprops(struct ubifs_info *c)

{

	ubifs_assert(mutex_is_locked(&c->lp_mutex));

	ubifs_assert(c->lst.empty_lebs >= 0 &&

		     c->lst.empty_lebs <= c->main_lebs);

	mutex_unlock(&c->lp_mutex);

}



#endif /* __UBIFS_MISC_H__ */

fs/ubifs/ubifs.h

+0 −2
Original line number Diff line number Diff line
@@ -1586,12 +1586,10 @@ int ubifs_lpt_post_commit(struct ubifs_info *c); 
void ubifs_lpt_free(struct ubifs_info *c, int wr_only);



/* lprops.c */

void ubifs_get_lprops(struct ubifs_info *c);

const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c,

					   const struct ubifs_lprops *lp,

					   int free, int dirty, int flags,

					   int idx_gc_cnt);

void ubifs_release_lprops(struct ubifs_info *c);

void ubifs_get_lp_stats(struct ubifs_info *c, struct ubifs_lp_stats *stats);

void ubifs_add_to_cat(struct ubifs_info *c, struct ubifs_lprops *lprops,

		      int cat);