Whamcloud - gitweb
LU-7061 osd-ldiskfs: NULL pointer in osd_scrub_refresh_mapping 20/20620/2
authorKit Westneat <kit.westneat@gmail.com>
Fri, 3 Jun 2016 18:22:50 +0000 (14:22 -0400)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 15 Aug 2016 21:10:56 +0000 (21:10 +0000)
Commit c0dafc483c (change 16138) missed a spot. id can be NULL for
DTO_INDEX_DELETE operation.

Signed-off-by: Kit Westneat <kit.westneat@gmail.com>
Change-Id: Id73f8dfb1834ff5275da006c03f59d4c56286aa7
Reviewed-on: http://review.whamcloud.com/20620
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/osd-ldiskfs/osd_scrub.c

index 0e497c3..1484e65 100644 (file)
@@ -115,7 +115,8 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info,
                rc = PTR_ERR(th);
                CDEBUG(D_LFSCK, "%s: fail to start trans for scrub op %d "
                       DFID" => %u/%u: rc = %d\n", osd_name(dev), ops,
-                      PFID(fid), id->oii_ino, id->oii_gen, rc);
+                      PFID(fid), id ? id->oii_ino : -1, id ? id->oii_gen : -1,
+                      rc);
                RETURN(rc);
        }