On Tue, Nov 05, 2013 at 10:31:15AM +0800, Miao Xie wrote:
> On tue, 5 Nov 2013 10:12:17 +0800, Liu Bo wrote:
> > Hi,
> >
> > Would you please try the following patch?
> >
> > -liubo
> >
> > From: Liu Bo <[email protected]>
> > Subject: [PATCH] Btrfs: fix to use the right trans for async commit
> >
> > @trans has been freed and is undefined, and we should use the trans
> > handle created for async commit instead.
> >
> > Signed-off-by: Liu Bo <[email protected]>
> > ---
> > fs/btrfs/transaction.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
> > index 8c81bdc..648d839 100644
> > --- a/fs/btrfs/transaction.c
> > +++ b/fs/btrfs/transaction.c
> > @@ -1494,7 +1494,7 @@ int btrfs_commit_transaction_async(struct
> > btrfs_trans_handle *trans,
> > * Tell lockdep we've released the freeze rwsem, since the
> > * async commit thread will be the one to unlock it.
> > */
> > - if (trans->type < TRANS_JOIN_NOLOCK)
> > + if (ac->newtrans->type < TRANS_JOIN_NOLOCK)
>
> It should be:
>
> if (trans->type & __TRANS_FREEZABLE)
>
> The same for
>
> do_async_commit()
Make sense, I missed that we've grabbed a reference on trans.
Ma,
Sorry for the previous noise, but could you please try the following one
instead?
-liubo
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 8c81bdc..c094f08 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1453,7 +1453,7 @@ static void do_async_commit(struct work_struct
*work)
* We've got freeze protection passed with the transaction.
* Tell lockdep about it.
*/
- if (ac->newtrans->type < TRANS_JOIN_NOLOCK)
+ if (ac->newtrans->type & __TRANS_FREEZABLE)
rwsem_acquire_read(
&ac->root->fs_info->sb->s_writers.lock_map[SB_FREEZE_FS-1],
0, 1, _THIS_IP_);
@@ -1494,7 +1494,7 @@ int btrfs_commit_transaction_async(struct
btrfs_trans_handle *trans,
* Tell lockdep we've released the freeze rwsem, since the
* async commit thread will be the one to unlock it.
*/
- if (trans->type < TRANS_JOIN_NOLOCK)
+ if (ac->newtrans->type & __TRANS_FREEZABLE)
rwsem_release(
&root->fs_info->sb->s_writers.lock_map[SB_FREEZE_FS-1],
1, _THIS_IP_);
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
