From patchwork Tue Jun 7 17:31:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858352 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p57HV9to013288 for ; Tue, 7 Jun 2011 17:31:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932118Ab1FGRbI (ORCPT ); Tue, 7 Jun 2011 13:31:08 -0400 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 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 7D7823083A6D; Tue, 7 Jun 2011 13:31:07 -0400 (EDT) X-Virus-Scanned: amavisd-new at int-mailstore01.merit.edu Received: from int-mailstore01.merit.edu ([127.0.0.1]) by localhost (int-mailstore01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WF-tw0CE4dda; Tue, 7 Jun 2011 13:31:06 -0400 (EDT) Received: from merit.edu (host-17.subnet-17.med.umich.edu [141.214.17.17]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id 29053305A9CC; Tue, 7 Jun 2011 13:31:06 -0400 (EDT) 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: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 07 Jun 2011 17:31:09 +0000 (UTC) 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) {