4.9-stable patches

added patches:
	udf-drop-unused-arguments-of-udf_delete_aext.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index 75cc726ad38e46558270e45d06efb0ef49d49fe2..295c526e5730af2a1d7584e2c7458c96114f7ed5 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -5,6 +5,7 @@ asoc-ops-check-bounds-for-second-channel-in-snd_soc_.patch
 can-sja1000-fix-size-of-ocr_mode_mask-define.patch
 asoc-ops-correct-bounds-check-for-second-channel-on-sx-controls.patch
 udf-discard-preallocation-before-extending-file-with-a-hole.patch
+udf-drop-unused-arguments-of-udf_delete_aext.patch
 udf-fix-preallocation-discarding-at-indirect-extent-boundary.patch
 udf-do-not-bother-looking-for-prealloc-extents-if-i_lenextents-matches-i_size.patch
 udf-fix-extending-file-within-last-block.patch

diff --git a/queue-4.9/udf-drop-unused-arguments-of-udf_delete_aext.patch b/queue-4.9/udf-drop-unused-arguments-of-udf_delete_aext.patch
new file mode 100644 (file)
index 0000000..3e7a207
--- /dev/null
+++ b/queue-4.9/udf-drop-unused-arguments-of-udf_delete_aext.patch
@@ -0,0 +1,83 @@
+From 6c1e4d06a3808dc67dbce2d631f4c12574567dd5 Mon Sep 17 00:00:00 2001
+From: Jan Kara <jack@suse.cz>
+Date: Wed, 13 Jun 2018 18:04:24 +0200
+Subject: udf: Drop unused arguments of udf_delete_aext()
+
+From: Jan Kara <jack@suse.cz>
+
+commit 6c1e4d06a3808dc67dbce2d631f4c12574567dd5 upstream.
+
+udf_delete_aext() uses its last two arguments only as local variables.
+Drop them.
+
+Signed-off-by: Jan Kara <jack@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/udf/balloc.c  |    5 ++---
+ fs/udf/inode.c   |    8 ++++----
+ fs/udf/udfdecl.h |    3 +--
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+
+--- a/fs/udf/balloc.c
++++ b/fs/udf/balloc.c
+@@ -531,8 +531,7 @@ static int udf_table_prealloc_blocks(str
+                       udf_write_aext(table, &epos, &eloc,
+                                       (etype << 30) | elen, 1);
+               } else
+-                      udf_delete_aext(table, epos, eloc,
+-                                      (etype << 30) | elen);
++                      udf_delete_aext(table, epos);
+       } else {
+               alloc_count = 0;
+       }
+@@ -627,7 +626,7 @@ static int udf_table_new_block(struct su
+       if (goal_elen)
+               udf_write_aext(table, &goal_epos, &goal_eloc, goal_elen, 1);
+       else
+-              udf_delete_aext(table, goal_epos, goal_eloc, goal_elen);
++              udf_delete_aext(table, goal_epos);
+       brelse(goal_epos.bh);
+ 
+       udf_add_free_space(sb, partition, -1);
+--- a/fs/udf/inode.c
++++ b/fs/udf/inode.c
+@@ -1190,8 +1190,7 @@ static void udf_update_extents(struct in
+ 
+       if (startnum > endnum) {
+               for (i = 0; i < (startnum - endnum); i++)
+-                      udf_delete_aext(inode, *epos, laarr[i].extLocation,
+-                                      laarr[i].extLength);
++                      udf_delete_aext(inode, *epos);
+       } else if (startnum < endnum) {
+               for (i = 0; i < (endnum - startnum); i++) {
+                       udf_insert_aext(inode, *epos, laarr[i].extLocation,
+@@ -2225,14 +2224,15 @@ static int8_t udf_insert_aext(struct ino
+       return (nelen >> 30);
+ }
+ 
+-int8_t udf_delete_aext(struct inode *inode, struct extent_position epos,
+-                     struct kernel_lb_addr eloc, uint32_t elen)
++int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)
+ {
+       struct extent_position oepos;
+       int adsize;
+       int8_t etype;
+       struct allocExtDesc *aed;
+       struct udf_inode_info *iinfo;
++      struct kernel_lb_addr eloc;
++      uint32_t elen;
+ 
+       if (epos.bh) {
+               get_bh(epos.bh);
+--- a/fs/udf/udfdecl.h
++++ b/fs/udf/udfdecl.h
+@@ -160,8 +160,7 @@ extern int udf_add_aext(struct inode *,
+                       struct kernel_lb_addr *, uint32_t, int);
+ extern void udf_write_aext(struct inode *, struct extent_position *,
+                          struct kernel_lb_addr *, uint32_t, int);
+-extern int8_t udf_delete_aext(struct inode *, struct extent_position,
+-                            struct kernel_lb_addr, uint32_t);
++extern int8_t udf_delete_aext(struct inode *, struct extent_position);
+ extern int8_t udf_next_aext(struct inode *, struct extent_position *,
+                           struct kernel_lb_addr *, uint32_t *, int);
+ extern int8_t udf_current_aext(struct inode *, struct extent_position *,