Satoshi Uchida
2007-Jun-05 10:01 UTC
[Xen-devel] [PATCH][XENTOP][2/4] Display blktap statistics.
This patch resolves collision of device_attribute structures between blktap and blkback, which created macro DEVICE_ATTR. by adding static, device_attribute structure is located local name space. # HG changeset patch # User s-uchida@ap.jp.nec.com # Date 1180665490 -32400 # Node ID d06f4b7fec7f132030fa7bd2dbb358c8bd761a6a # Parent 32d03e18fda8aad13b1674104eb2d32854be1403 BLKBK:Resolved collision with blktap. Sigened-off-by: Satoshi UCHIDA <s-uchida@ap.jp.nec.com> diff -r 32d03e18fda8 -r d06f4b7fec7f linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c --- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c Fri Jun 01 11:33:59 2007 +0900 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c Fri Jun 01 11:38:10 2007 +0900 @@ -111,7 +111,7 @@ static void update_blkif_status(blkif_t \ return sprintf(buf, format, ##args); \ } \ - DEVICE_ATTR(name, S_IRUGO, show_##name, NULL) + static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL) VBD_SHOW(oo_req, "%d\n", be->blkif->st_oo_req); VBD_SHOW(rd_req, "%d\n", be->blkif->st_rd_req); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel