Commit cd6fb584 authored Jun 27, 2005 by Mike Miller Committed by Linus Torvalds Jun 27, 2005

[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>

parent 3de0a70b

drivers/block/cciss.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -638,6 +638,7 @@ static int cciss_ioctl(struct inode inode, struct file filep,
		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;

include/linux/cciss_ioctl.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;