lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 4.4 49/91] ext4: preserve the needs_recovery flag when the journal is aborted
On Fri, Mar 10, 2017 at 04:58:02PM +0000, Ben Hutchings wrote:
> > ---
> >  fs/ext4/super.c |    6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > --- a/fs/ext4/super.c
> > +++ b/fs/ext4/super.c
> [...]
> > @@ -802,9 +803,10 @@ static void ext4_put_super(struct super_
> >   destroy_workqueue(sbi->rsv_conversion_wq);
> >  
> >   if (sbi->s_journal) {
> > + aborted = is_journal_aborted(sbi->s_journal);
> >   err = jbd2_journal_destroy(sbi->s_journal);
> >   sbi->s_journal = NULL;
> > - if (err < 0)
> > + if ((err < 0) && !aborted)
> >   ext4_abort(sb, "Couldn't clean up the journal");
> [...]
>
> Shouldn't the aborted flag also be set here when err < 0?

Nice catch. That's a separate issue (the bug was there before this
commit), though I'll send a separate patch to fix this in mainline and
then cc stable, OK?

- Ted

\
 
 \ /
  Last update: 2017-03-10 21:14    [W:0.210 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site