[PATCH] cciss: pci domain info pass 2

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 <mike.miller@hp.com>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Mike Miller and committed by Linus Torvalds cd6fb584 3de0a70b

+2
+1
drivers/block/cciss.c
··· 638 cciss_pci_info_struct pciinfo; 639 640 if (!arg) return -EINVAL; 641 pciinfo.bus = host->pdev->bus->number; 642 pciinfo.dev_fn = host->pdev->devfn; 643 pciinfo.board_id = host->board_id;
··· 638 cciss_pci_info_struct pciinfo; 639 640 if (!arg) return -EINVAL; 641 + pciinfo.domain = pci_domain_nr(host->pdev->bus); 642 pciinfo.bus = host->pdev->bus->number; 643 pciinfo.dev_fn = host->pdev->devfn; 644 pciinfo.board_id = host->board_id;
+1
include/linux/cciss_ioctl.h
··· 10 typedef struct _cciss_pci_info_struct 11 { 12 unsigned char bus; 13 unsigned char dev_fn; 14 __u32 board_id; 15 } cciss_pci_info_struct;
··· 10 typedef struct _cciss_pci_info_struct 11 { 12 unsigned char bus; 13 + unsigned short domain; 14 unsigned char dev_fn; 15 __u32 board_id; 16 } cciss_pci_info_struct;