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

Commit 57e95460 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Ilya Dryomov
Browse files

ceph: match wait_for_completion_timeout return type 



return type of wait_for_completion_timeout is unsigned long not int. An
appropriately named unsigned long is added and the assignment fixed up.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
parent 3563dbdd

fs/ceph/dir.c

+5 −4
Original line number Diff line number Diff line
@@ -1242,11 +1242,12 @@ static int ceph_dir_fsync(struct file *file, loff_t start, loff_t end, 
		dout("dir_fsync %p wait on tid %llu (until %llu)\n",

		     inode, req->r_tid, last_tid);

		if (req->r_timeout) {

			ret = wait_for_completion_timeout(

				&req->r_safe_completion, req->r_timeout);

			if (ret > 0)

			unsigned long time_left = wait_for_completion_timeout(

							&req->r_safe_completion,

							req->r_timeout);

			if (time_left > 0)

				ret = 0;

			else if (ret == 0)

			else

				ret = -EIO;  /* timed out */

		} else {

			wait_for_completion(&req->r_safe_completion);