[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mm-commits
Subject:    [folded-merged] fix-clusters-leak-in-ocfs2_defrag_extent-fix.patch removed from -mm tree
From:       akpm () linux-foundation ! org
Date:       2018-10-31 21:26:49
Message-ID: 20181031212649.1XB1k%akpm () linux-foundation ! org
[Download RAW message or body]


The patch titled
     Subject: fix-clusters-leak-in-ocfs2_defrag_extent-fix
has been removed from the -mm tree.  Its filename was
     fix-clusters-leak-in-ocfs2_defrag_extent-fix.patch

This patch was dropped because it was folded into fix-clusters-leak-in-ocfs2_defrag_extent.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: fix-clusters-leak-in-ocfs2_defrag_extent-fix

include localalloc.h, reduce scope of data_ac

Cc: Larry Chen <lchen@suse.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <jiangqi903@gmail.com>
Cc: Changwei Ge <ge.changwei@h3c.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/ocfs2/move_extents.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/fs/ocfs2/move_extents.c~fix-clusters-leak-in-ocfs2_defrag_extent-fix
+++ a/fs/ocfs2/move_extents.c
@@ -25,6 +25,7 @@
 #include "ocfs2_ioctl.h"
 
 #include "alloc.h"
+#include "localalloc.h"
 #include "aops.h"
 #include "dlmglue.h"
 #include "extent_map.h"
@@ -227,7 +228,6 @@ static int ocfs2_defrag_extent(struct oc
 	u32 new_phys_cpos, new_len;
 	u64 phys_blkno = ocfs2_clusters_to_blocks(inode->i_sb, phys_cpos);
 	int need_free = 0;
-	struct ocfs2_alloc_context *data_ac;
 
 	if ((ext_flags & OCFS2_EXT_REFCOUNTED) && *len) {
 		BUG_ON(!ocfs2_is_refcount_inode(inode));
@@ -345,7 +345,8 @@ static int ocfs2_defrag_extent(struct oc
 
 out_commit:
 	if (need_free && context->data_ac) {
-		data_ac = context->data_ac;
+		struct ocfs2_alloc_context *data_ac = context->data_ac;
+
 		if (context->data_ac->ac_which == OCFS2_AC_USE_LOCAL)
 			ocfs2_free_local_alloc_bits(osb, handle, data_ac,
 					new_phys_cpos, new_len);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fix-clusters-leak-in-ocfs2_defrag_extent.patch
mm.patch
memory_hotplug-free-pages-as-higher-order-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch

[prev in list] [next in list] [prev in thread] [next in thread]