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

Commit e3dc5a66 authored by Adrian Hunter's avatar Adrian Hunter Committed by Artem Bityutskiy
Browse files

UBIFS: fix integer overflow warning 



Fix the following warning:

fs/ubifs/io.c: In function 'ubifs_wbuf_init':
fs/ubifs/io.c:860: warning: integer overflow in expression

And limit maximum hrtimer delta to ULONG_MAX because the
argument is 'unsigned long'.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 8e4a718f

fs/ubifs/io.c

+3 −1
Original line number Diff line number Diff line
@@ -857,7 +857,9 @@ int ubifs_wbuf_init(struct ubifs_info *c, struct ubifs_wbuf *wbuf) 
	 * and hard limits.

	 */

	hardlimit = ktime_set(DEFAULT_WBUF_TIMEOUT_SECS, 0);

	wbuf->delta = (DEFAULT_WBUF_TIMEOUT_SECS * NSEC_PER_SEC) * 2 / 10;

	wbuf->delta = DEFAULT_WBUF_TIMEOUT_SECS * 1000000000ULL * 2 / 10;

	if (wbuf->delta > ULONG_MAX)

		wbuf->delta = ULONG_MAX;

	wbuf->softlimit = ktime_sub_ns(hardlimit, wbuf->delta);

	hrtimer_set_expires_range_ns(&wbuf->timer,  wbuf->softlimit,

				     wbuf->delta);