Re: softupdate with journal panic

[Kostik Belousov]

On Sun, Aug 22, 2010 at 03:21:04PM +0200, Peter Holm wrote:
> On Sat, Aug 21, 2010 at 01:49:45PM -0400, Michael Butler wrote:
> > While updating sysutils/coreutils port on -current as of this morning
> > (SVN r211550), I noted a panic during the directory rename config test.
> > 
> 
> Your problem seems identical to this report:
> 
> http://docs.freebsd.org/cgi/mid.cgi?AANLkTinPjiOV21kDLZYV5WScrhLMN7DY8E8jVHWPU5mC
> 
I believe that dotdotremref in this case is legitimately NULL. With this
assumption, the following patch would help.

diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index b666c0f..65e5255 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -6770,7 +6794,8 @@ cancel_diradd(dap, dirrem, jremref, dotremref, 
dotdotremref)
                        mkdir->md_jaddref = NULL;
                        if (mkdir->md_state & MKDIR_PARENT) {
                                if (cancel_jaddref(jaddref, NULL,
-                                   &dirrem->dm_jwork) == 0) {
+                                   &dirrem->dm_jwork) == 0 &&
+                                   dotdotremref != NULL) {
                                        free_jremref(dotdotremref);
                                        dotdotremref = NULL;
                                }

pgpC3HRGXzRwT.pgp
Description: PGP signature