Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-2
+2
-1
fs/fuse/dev.c
+2
-1
fs/fuse/dev.c
···
2025
2025
struct fuse_req *req;
2026
2026
req = list_entry(head->next, struct fuse_req, list);
2027
2027
req->out.h.error = -ECONNABORTED;
2028
-
clear_bit(FR_PENDING, &req->flags);
2029
2028
clear_bit(FR_SENT, &req->flags);
2030
2029
list_del_init(&req->list);
2031
2030
request_end(fc, req);
···
2102
2103
spin_lock(&fiq->waitq.lock);
2103
2104
fiq->connected = 0;
2104
2105
list_splice_init(&fiq->pending, &to_end2);
2106
+
list_for_each_entry(req, &to_end2, list)
2107
+
clear_bit(FR_PENDING, &req->flags);
2105
2108
while (forget_pending(fiq))
2106
2109
kfree(dequeue_forget(fiq, 1, NULL));
2107
2110
wake_up_all_locked(&fiq->waitq);