From: Ben Myers <bpm@sgi.com>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 1/2] xfs: really fix the cursor leak in xfs_alloc_ag_vextent_near
Date: Fri, 13 Jul 2012 12:18:10 -0500 [thread overview]
Message-ID: <20120713171810.GG29979@sgi.com> (raw)
In-Reply-To: <1342042843-1773-2-git-send-email-david@fromorbit.com>
Hi Dave,
On Thu, Jul 12, 2012 at 07:40:42AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> The current cursor is reallocated when retrying the allocation, so
> the existing cursor needs to be destroyed in both the restart and
> the failure cases.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> Tested-by: Mike Snitzer <snitzer@redhat.com>
> ---
> fs/xfs/xfs_alloc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
> index 9d1aeb7..f654f51 100644
> --- a/fs/xfs/xfs_alloc.c
> +++ b/fs/xfs/xfs_alloc.c
> @@ -1074,13 +1074,13 @@ restart:
> * If we couldn't get anything, give up.
> */
> if (bno_cur_lt == NULL && bno_cur_gt == NULL) {
> + xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
> +
I'd suggest setting cnt_cur = NULL here, but it is very clearly overwritten
right away in the case of goto restart. No need.
This looks good to me. I'll pull this in today.
Reviewed-by: Ben Myers <bpm@sgi.com>
Regards,
Ben
> if (!forced++) {
> trace_xfs_alloc_near_busy(args);
> xfs_log_force(args->mp, XFS_LOG_SYNC);
> goto restart;
> }
> -
> - xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
> trace_xfs_alloc_size_neither(args);
> args->agbno = NULLAGBLOCK;
> return 0;
> --
> 1.7.10
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2012-07-13 17:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-11 21:40 [PATCH 0/2] xfs: regression fixes for 3.5-rc7 Dave Chinner
2012-07-11 21:40 ` [PATCH 1/2] xfs: really fix the cursor leak in xfs_alloc_ag_vextent_near Dave Chinner
2012-07-13 17:18 ` Ben Myers [this message]
2012-07-11 21:40 ` [PATCH 2/2] xfs: don't defer metadata allocation to the workqueue Dave Chinner
2012-07-11 22:48 ` [PATCH 0/2] xfs: regression fixes for 3.5-rc7 Ben Myers
2012-07-11 23:52 ` Dave Chinner
2012-07-12 8:24 ` Christoph Hellwig
2012-07-13 17:36 ` Ben Myers
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=20120713171810.GG29979@sgi.com \
--to=bpm@sgi.com \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.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