From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262069AbVFQTt7 (ORCPT ); Fri, 17 Jun 2005 15:49:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262082AbVFQTt7 (ORCPT ); Fri, 17 Jun 2005 15:49:59 -0400 Received: from ccerelbas02.cce.hp.com ([161.114.21.105]:23229 "EHLO ccerelbas02.cce.hp.com") by vger.kernel.org with ESMTP id S262069AbVFQTtx (ORCPT ); Fri, 17 Jun 2005 15:49:53 -0400 Date: Fri, 17 Jun 2005 13:50:25 -0500 From: mike.miller@hp.com To: akpm@osdl.org, axboe@suse.de Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH] cciss 2.6: pci domain info pass 2 Message-ID: <20050617185025.GA10336@beardog.cca.cpqcorp.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.6i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This is pass 2 of my patch to add pci domain info to an existing ioctl. This time I insert the domain between dev_fn and board_id as Willy suggested and change the var to unsigned short to ease Christoph's concerns. Although I thought unsigned int was the correct var type for this. I also thought it didn't matter where I inserted it in the structure. Signed-off-by: Mike Miller drivers/block/cciss.c | 1 + include/linux/cciss_ioctl.h | 1 + 2 files changed, 2 insertions(+) ------------------------------------------------------------------------------- diff -burNp lx2612-rc6.orig/drivers/block/cciss.c lx2612-rc6/drivers/block/cciss.c --- lx2612-rc6.orig/drivers/block/cciss.c 2005-06-14 12:04:34.000000000 -0500 +++ lx2612-rc6/drivers/block/cciss.c 2005-06-17 13:04:52.384575144 -0500 @@ -636,6 +636,7 @@ static int cciss_ioctl(struct inode *ino cciss_pci_info_struct pciinfo; if (!arg) return -EINVAL; + pciinfo.domain = pci_domain_nr(host->pdev->bus); pciinfo.bus = host->pdev->bus->number; pciinfo.dev_fn = host->pdev->devfn; pciinfo.board_id = host->board_id; diff -burNp lx2612-rc6.orig/include/linux/cciss_ioctl.h lx2612-rc6/include/linux/cciss_ioctl.h --- lx2612-rc6.orig/include/linux/cciss_ioctl.h 2005-03-02 01:38:07.000000000 -0600 +++ lx2612-rc6/include/linux/cciss_ioctl.h 2005-06-17 13:06:42.082898464 -0500 @@ -9,6 +9,7 @@ typedef struct _cciss_pci_info_struct { unsigned char bus; unsigned char dev_fn; + unsigned short domain; __u32 board_id;