Return-Path: Received: from int-mailstore01.merit.edu ([207.75.116.232]:50941 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932116Ab1FGRbH (ORCPT ); Tue, 7 Jun 2011 13:31:07 -0400 Date: Tue, 7 Jun 2011 13:31:05 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 43/88] SQUASHME: pnfsblock: fix bug when decoding block device info. Message-ID: <6907342571a9ea8211134ccf39dcdf538bacc146.1307464382.git.rees@umich.edu> References: Content-Type: text/plain; charset=us-ascii In-Reply-To: Sender: linux-nfs-owner@vger.kernel.org List-ID: MIME-Version: 1.0 From: Tao Guo Skip local block device if its gendisk structure is NULL. Signed-off-by: Tao Guo Signed-off-by: Benny Halevy --- fs/nfs/blocklayout/blocklayoutdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayoutdev.c b/fs/nfs/blocklayout/blocklayoutdev.c index ac5c117..9fc3d46 100644 --- a/fs/nfs/blocklayout/blocklayoutdev.c +++ b/fs/nfs/blocklayout/blocklayoutdev.c @@ -375,7 +375,7 @@ static int map_sig_to_device(struct pnfs_blk_sig *sig, struct visible_block_device *vis_dev; list_for_each_entry(vis_dev, sdlist, vi_node) { - if (vis_dev->vi_mapped) + if (vis_dev->vi_mapped || !vis_dev->vi_bdev->bd_disk) continue; mapped = verify_sig(vis_dev->vi_bdev, sig); if (mapped) { -- 1.7.4.1