From: Greg Kroah-Hartman Date: Sat, 9 Dec 2017 17:11:32 +0000 (+0100) Subject: drop some 3.18 patches X-Git-Tag: v3.18.87~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ec442a423ad8886dad4113ca66ad5eac7b36c37;p=thirdparty%2Fkernel%2Fstable-queue.git drop some 3.18 patches --- diff --git a/queue-3.18/nfs-don-t-take-a-reference-on-fl-fl_file-for-lock-operation.patch b/queue-3.18/nfs-don-t-take-a-reference-on-fl-fl_file-for-lock-operation.patch deleted file mode 100644 index 18eade41cfc..00000000000 --- a/queue-3.18/nfs-don-t-take-a-reference-on-fl-fl_file-for-lock-operation.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Tue Dec 5 18:18:39 CET 2017 -From: Benjamin Coddington -Date: Thu, 5 Jan 2017 10:20:16 -0500 -Subject: nfs: Don't take a reference on fl->fl_file for LOCK operation - -From: Benjamin Coddington - - -[ Upstream commit 4b09ec4b14a168bf2c687e1f598140c3c11e9222 ] - -I have reports of a crash that look like __fput() was called twice for -a NFSv4.0 file. It seems possible that the state manager could try to -reclaim a lock and take a reference on the fl->fl_file at the same time the -file is being released if, during the close(), a signal interrupts the wait -for outstanding IO while removing locks which then skips the removal -of that lock. - -Since 83bfff23e9ed ("nfs4: have do_vfs_lock take an inode pointer") has -removed the need to traverse fl->fl_file->f_inode in nfs4_lock_done(), -taking that reference is no longer necessary. - -Signed-off-by: Benjamin Coddington -Reviewed-by: Jeff Layton -Signed-off-by: Trond Myklebust -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - fs/nfs/nfs4proc.c | 3 --- - 1 file changed, 3 deletions(-) - ---- a/fs/nfs/nfs4proc.c -+++ b/fs/nfs/nfs4proc.c -@@ -38,7 +38,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -5544,7 +5543,6 @@ static struct nfs4_lockdata *nfs4_alloc_ - p->server = server; - atomic_inc(&lsp->ls_count); - p->ctx = get_nfs_open_context(ctx); -- get_file(fl->fl_file); - memcpy(&p->fl, fl, sizeof(p->fl)); - return p; - out_free_seqid: -@@ -5634,7 +5632,6 @@ static void nfs4_lock_release(void *call - nfs_free_seqid(data->arg.lock_seqid); - nfs4_put_lock_state(data->lsp); - put_nfs_open_context(data->ctx); -- fput(data->fl.fl_file); - kfree(data); - dprintk("%s: done!\n", __func__); - } diff --git a/queue-3.18/series b/queue-3.18/series index a51bf0f9e00..5c069df3364 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -4,12 +4,10 @@ serial-8250_fintek-fix-rs485-disablement-on-invalid-ioctl.patch spi-sh-msiof-fix-dma-transfer-size-check.patch edac-sb_edac-fix-missing-break-in-switch.patch sysrq-fix-show-regs-call-trace-on-arm.patch -usbip-tools-install-all-headers-needed-for-libusbip-development.patch perf-test-attr-fix-ignored-test-case-result.patch arm-omap1-dma-correct-the-number-of-logical-channels.patch vti6-fix-device-register-to-report-ifla_info_kind.patch net-appletalk-fix-kernel-memory-disclosure.patch -nfs-don-t-take-a-reference-on-fl-fl_file-for-lock-operation.patch nfsv4-fix-client-recovery-when-server-reboots-multiple-times.patch net-sctp-fix-array-overrun-read-on-sctp_timer_tbl.patch tipc-fix-cleanup-at-module-unload.patch diff --git a/queue-3.18/usbip-tools-install-all-headers-needed-for-libusbip-development.patch b/queue-3.18/usbip-tools-install-all-headers-needed-for-libusbip-development.patch deleted file mode 100644 index 9e00eaf6170..00000000000 --- a/queue-3.18/usbip-tools-install-all-headers-needed-for-libusbip-development.patch +++ /dev/null @@ -1,35 +0,0 @@ -From foo@baz Tue Dec 5 18:18:39 CET 2017 -From: Ben Hutchings -Date: Sun, 1 Oct 2017 02:18:37 +0100 -Subject: usbip: tools: Install all headers needed for libusbip development - -From: Ben Hutchings - - -[ Upstream commit c15562c0dcb2c7f26e891923b784cf1926b8c833 ] - -usbip_host_driver.h now depends on several additional headers, which -need to be installed along with it. - -Fixes: 021aed845303 ("staging: usbip: userspace: migrate usbip_host_driver ...") -Fixes: 3391ba0e2792 ("usbip: tools: Extract generic code to be shared with ...") -Signed-off-by: Ben Hutchings -Acked-by: Shuah Khan -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - tools/usb/usbip/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/tools/usb/usbip/Makefile.am -+++ b/tools/usb/usbip/Makefile.am -@@ -1,6 +1,7 @@ - SUBDIRS := libsrc src - includedir = @includedir@/usbip - include_HEADERS := $(addprefix libsrc/, \ -- usbip_common.h vhci_driver.h usbip_host_driver.h) -+ usbip_common.h vhci_driver.h usbip_host_driver.h \ -+ list.h sysfs_utils.h usbip_host_common.h) - - dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8)