From: Mike Miller 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 Acked-by: Jeff Garzik Signed-off-by: Andrew Morton --- drivers/block/cciss.c | 1 + include/linux/cciss_ioctl.h | 1 + 2 files changed, 2 insertions(+) diff -puN drivers/block/cciss.c~cciss-26-pci-domain-info-pass-2 drivers/block/cciss.c --- 25/drivers/block/cciss.c~cciss-26-pci-domain-info-pass-2 2005-06-24 00:51:06.000000000 -0700 +++ 25-akpm/drivers/block/cciss.c 2005-06-24 00:51:06.000000000 -0700 @@ -638,6 +638,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 -puN include/linux/cciss_ioctl.h~cciss-26-pci-domain-info-pass-2 include/linux/cciss_ioctl.h --- 25/include/linux/cciss_ioctl.h~cciss-26-pci-domain-info-pass-2 2005-06-24 00:51:06.000000000 -0700 +++ 25-akpm/include/linux/cciss_ioctl.h 2005-06-24 00:51:06.000000000 -0700 @@ -10,6 +10,7 @@ typedef struct _cciss_pci_info_struct { unsigned char bus; + unsigned short domain; unsigned char dev_fn; __u32 board_id; } cciss_pci_info_struct; _