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

Commit 854826c9 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Richard Weinberger
Browse files

ubifs: Drop softlimit and delta fields from struct ubifs_wbuf 



Values of these fields are set during init and never modified. They are
used (read) in a single function only. There isn't really any reason to
keep them in a struct. It only makes struct just a bit bigger without
any visible gain.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 6a34e4d2

fs/ubifs/io.c

+10 −8
Original line number Diff line number Diff line
@@ -452,16 +452,22 @@ static enum hrtimer_restart wbuf_timer_callback_nolock(struct hrtimer *timer) 
 */

static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf)

{

	ktime_t softlimit = ktime_set(WBUF_TIMEOUT_SOFTLIMIT, 0);

	unsigned long long delta;



	delta = WBUF_TIMEOUT_HARDLIMIT - WBUF_TIMEOUT_SOFTLIMIT;

	delta *= 1000000000ULL;



	ubifs_assert(!hrtimer_active(&wbuf->timer));

	ubifs_assert(delta <= ULONG_MAX);



	if (wbuf->no_timer)

		return;

	dbg_io("set timer for jhead %s, %llu-%llu millisecs",

	       dbg_jhead(wbuf->jhead),

	       div_u64(ktime_to_ns(wbuf->softlimit), USEC_PER_SEC),

	       div_u64(ktime_to_ns(wbuf->softlimit) + wbuf->delta,

		       USEC_PER_SEC));

	hrtimer_start_range_ns(&wbuf->timer, wbuf->softlimit, wbuf->delta,

	       div_u64(ktime_to_ns(softlimit), USEC_PER_SEC),

	       div_u64(ktime_to_ns(softlimit) + delta, USEC_PER_SEC));

	hrtimer_start_range_ns(&wbuf->timer, softlimit, delta,

			       HRTIMER_MODE_REL);

}
@@ -1059,10 +1065,6 @@ int ubifs_wbuf_init(struct ubifs_info *c, struct ubifs_wbuf *wbuf) 


	hrtimer_init(&wbuf->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

	wbuf->timer.function = wbuf_timer_callback_nolock;

	wbuf->softlimit = ktime_set(WBUF_TIMEOUT_SOFTLIMIT, 0);

	wbuf->delta = WBUF_TIMEOUT_HARDLIMIT - WBUF_TIMEOUT_SOFTLIMIT;

	wbuf->delta *= 1000000000ULL;

	ubifs_assert(wbuf->delta <= ULONG_MAX);

	return 0;

}

fs/ubifs/ubifs.h

+0 −5
Original line number Diff line number Diff line
@@ -645,9 +645,6 @@ typedef int (*ubifs_lpt_scan_callback)(struct ubifs_info *c, 
 * @io_mutex: serializes write-buffer I/O

 * @lock: serializes @buf, @lnum, @offs, @avail, @used, @next_ino and @inodes

 *        fields

 * @softlimit: soft write-buffer timeout interval

 * @delta: hard and soft timeouts delta (the timer expire interval is @softlimit

 *         and @softlimit + @delta)

 * @timer: write-buffer timer

 * @no_timer: non-zero if this write-buffer does not have a timer

 * @need_sync: non-zero if the timer expired and the wbuf needs sync'ing
@@ -676,8 +673,6 @@ struct ubifs_wbuf { 
	int (*sync_callback)(struct ubifs_info *c, int lnum, int free, int pad);

	struct mutex io_mutex;

	spinlock_t lock;

	ktime_t softlimit;

	unsigned long long delta;

	struct hrtimer timer;

	unsigned int no_timer:1;

	unsigned int need_sync:1;