From: Andrew Morton <akpm@linux-foundation.org>
To: Larry Chen <lchen@suse.com>
Cc: mark@fasheh.com, jlbec@evilplan.org,
linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com
Subject: Re: [PATCH 1/2] add declaration of ocfs2_free_local_alloc_bits
Date: Tue, 4 Sep 2018 14:55:10 -0700 [thread overview]
Message-ID: <20180904145510.9dd257f40514c8c839745bf4@linux-foundation.org> (raw)
In-Reply-To: <20180904041621.16874-2-lchen@suse.com>
On Tue, 4 Sep 2018 12:16:20 +0800 Larry Chen <lchen@suse.com> wrote:
> Signed-off-by: Larry Chen <lchen@suse.com>
> ---
> fs/ocfs2/alloc.h | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/fs/ocfs2/alloc.h b/fs/ocfs2/alloc.h
> index 250bcacdf9e9..5770503b0e36 100644
> --- a/fs/ocfs2/alloc.h
> +++ b/fs/ocfs2/alloc.h
> @@ -323,4 +323,10 @@ int ocfs2_find_cpos_for_left_leaf(struct super_block *sb,
> int ocfs2_find_subtree_root(struct ocfs2_extent_tree *et,
> struct ocfs2_path *left,
> struct ocfs2_path *right);
> +
> +int ocfs2_free_local_alloc_bits(struct ocfs2_super *osb,
> + handle_t *handle,
> + struct ocfs2_alloc_context *ac,
> + u32 bit_off,
> + u32 num_bits);
> #endif /* OCFS2_ALLOC_H */
It's already declared in fs/ocfs2/localalloc.h - why not include that?
I did this with the other patch and all seems well:
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>
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);
_
next prev parent reply other threads:[~2018-09-04 21:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-04 4:16 [PATCH 0/2] fix cluster leakage in ocfs2_defrag_extent Larry Chen
2018-09-04 4:16 ` [PATCH 1/2] add declaration of ocfs2_free_local_alloc_bits Larry Chen
2018-09-04 21:55 ` Andrew Morton [this message]
2018-09-04 4:16 ` [PATCH 2/2] fix clusters leak in ocfs2_defrag_extent Larry Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180904145510.9dd257f40514c8c839745bf4@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=jlbec@evilplan.org \
--cc=lchen@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark@fasheh.com \
--cc=ocfs2-devel@oss.oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®