diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-04 09:45:52 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-04 09:45:52 -0400 |
| commit | 3e8a3dc318dc2d1385a80c043d0b3fdd02fbadd3 (patch) | |
| tree | 3e25dd0fb1f45889dbb4d5f0f936d95702794460 | |
| parent | 2c1c784ac94c60c3033ac53b3f322682d62c8cbf (diff) | |
| download | longterm-queue-4.12-3e8a3dc318dc2d1385a80c043d0b3fdd02fbadd3.tar.gz | |
afs: drop patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/afs-Fix-total-length-calculation-for-multiple-page-s.patch | 47 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 48 deletions
diff --git a/queue/afs-Fix-total-length-calculation-for-multiple-page-s.patch b/queue/afs-Fix-total-length-calculation-for-multiple-page-s.patch deleted file mode 100644 index 4798196..0000000 --- a/queue/afs-Fix-total-length-calculation-for-multiple-page-s.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1199db603511d7463d9d3840f96f61967affc766 Mon Sep 17 00:00:00 2001 -From: David Howells <dhowells@redhat.com> -Date: Thu, 2 Nov 2017 15:27:51 +0000 -Subject: [PATCH] afs: Fix total-length calculation for multiple-page send - -commit 1199db603511d7463d9d3840f96f61967affc766 upstream. - -Fix the total-length calculation in afs_make_call() when the operation -being dispatched has data from a series of pages attached. - -Despite the patched code looking like that it should reduce mathematically -to the current code, it doesn't because the 32-bit unsigned arithmetic -being used to calculate the page-offset-difference doesn't correctly extend -to a 64-bit value when the result is effectively negative. - -Without this, some FS.StoreData operations that span multiple pages fail, -reporting too little or too much data. - -Signed-off-by: David Howells <dhowells@redhat.com> - -diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c -index 21f43d3acb91..1d075696bf55 100644 ---- a/fs/afs/rxrpc.c -+++ b/fs/afs/rxrpc.c -@@ -350,8 +350,17 @@ long afs_make_call(struct afs_addr_cursor *ac, struct afs_call *call, - */ - tx_total_len = call->request_size; - if (call->send_pages) { -- tx_total_len += call->last_to - call->first_offset; -- tx_total_len += (call->last - call->first) * PAGE_SIZE; -+ if (call->last == call->first) { -+ tx_total_len += call->last_to - call->first_offset; -+ } else { -+ /* It looks mathematically like you should be able to -+ * combine the following lines with the ones above, but -+ * unsigned arithmetic is fun when it wraps... -+ */ -+ tx_total_len += PAGE_SIZE - call->first_offset; -+ tx_total_len += call->last_to; -+ tx_total_len += (call->last - call->first - 1) * PAGE_SIZE; -+ } - } - - /* create a call */ --- -2.15.0 - diff --git a/queue/series b/queue/series index bfe9ad9..9b0e916 100644 --- a/queue/series +++ b/queue/series @@ -95,7 +95,6 @@ f2fs-fix-to-clear-FI_NO_PREALLOC.patch bnxt_re-changing-the-ip-address-shouldn-t-affect-new.patch IB-mlx4-Increase-maximal-message-size-under-UD-QP.patch IB-mlx5-Assign-send-CQ-and-recv-CQ-of-UMR-QP.patch -afs-Fix-total-length-calculation-for-multiple-page-s.patch afs-Connect-up-the-CB.ProbeUuid.patch kbuild-do-not-call-cc-option-before-KBUILD_CFLAGS-in.patch powerpc-powernv-idle-Round-up-latency-and-residency-.patch |