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

Commit eefa9feb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

Pull fuse fixes from Miklos Szeredi:
 "Fix two regressions, one introduced in 4.9 and a less recent one in
  4.2"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix time_to_jiffies nsec sanity check
  fuse: clear FR_PENDING flag when moving requests out of pending queue
parents f09ff1de 21067527

fs/fuse/dev.c

+2 −1
Original line number Diff line number Diff line
@@ -2025,7 +2025,6 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head) 
		struct fuse_req *req;

		req = list_entry(head->next, struct fuse_req, list);

		req->out.h.error = -ECONNABORTED;

		clear_bit(FR_PENDING, &req->flags);

		clear_bit(FR_SENT, &req->flags);

		list_del_init(&req->list);

		request_end(fc, req);
@@ -2103,6 +2102,8 @@ void fuse_abort_conn(struct fuse_conn *fc) 
		spin_lock(&fiq->waitq.lock);

		fiq->connected = 0;

		list_splice_init(&fiq->pending, &to_end2);

		list_for_each_entry(req, &to_end2, list)

			clear_bit(FR_PENDING, &req->flags);

		while (forget_pending(fiq))

			kfree(dequeue_forget(fiq, 1, NULL));

		wake_up_all_locked(&fiq->waitq);

fs/fuse/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static u64 time_to_jiffies(u64 sec, u32 nsec) 
	if (sec || nsec) {

		struct timespec64 ts = {

			sec,

			max_t(u32, nsec, NSEC_PER_SEC - 1)

			min_t(u32, nsec, NSEC_PER_SEC - 1)

		};



		return get_jiffies_64() + timespec64_to_jiffies(&ts);