LU-7061 osd-ldiskfs: NULL pointer dereference in osd_scrub_refresh_mapping

id can be NULL for DTO_INDEX_DELETE operation.

Change-Id: I0ead24b8d9112d65b48b8d96d93181fa17d04c49
Xyratex-bug-id: MRP-2431
Signed-off-by: Andriy Skulysh <andriy.skulysh@seagate.com>
Reviewed-on: http://review.whamcloud.com/16138
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c
index 7713c4f..567560c 100644 (file)
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -181,7 +181,8 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info,
        if (rc < 0)
                CDEBUG(D_LFSCK, "%s: fail to refresh OI map for scrub op %d "
                       DFID" => %u/%u: rc = %d\n", osd_name(dev), ops,
        if (rc < 0)
                CDEBUG(D_LFSCK, "%s: fail to refresh OI map 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);
 }
 
        RETURN(rc);
 }