Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 251263
b: refs/heads/master
c: 30fd150
h: refs/heads/master
i:
  251261: f92e117
  251259: 518d2e3
  251255: 567fc27
  251247: 32d0ab9
  251231: 3493c5d
  251199: 6591702
  251135: c235490
v: v3
  • Loading branch information
Konrad Rzeszutek Wilk committed May 12, 2011
1 parent 2099bbd commit b48118c
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 325a64860472765ecaeaa0081e9ddd67671183d4
refs/heads/master: 30fd150202fb2d08a62f9c2966a4b1fcf2e861e7
28 changes: 14 additions & 14 deletions trunk/drivers/block/xen-blkback/blkback.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module_param(log_stats, int, 0644);
* response queued for it, with the saved 'id' passed back.
*/
struct pending_req {
struct blkif_st *blkif;
struct xen_blkif *blkif;
u64 id;
int nr_pages;
atomic_t pendcnt;
Expand Down Expand Up @@ -121,11 +121,11 @@ static inline unsigned long vaddr(struct pending_req *req, int seg)
(blkbk->pending_grant_handles[vaddr_pagenr(_req, _seg)])


static int do_block_io_op(struct blkif_st *blkif);
static int dispatch_rw_block_io(struct blkif_st *blkif,
static int do_block_io_op(struct xen_blkif *blkif);
static int dispatch_rw_block_io(struct xen_blkif *blkif,
struct blkif_request *req,
struct pending_req *pending_req);
static void make_response(struct blkif_st *blkif, u64 id,
static void make_response(struct xen_blkif *blkif, u64 id,
unsigned short op, int st);

/*
Expand Down Expand Up @@ -166,7 +166,7 @@ static void free_req(struct pending_req *req)
/*
* Routines for managing virtual block devices (vbds).
*/
static int vbd_translate(struct phys_req *req, struct blkif_st *blkif,
static int vbd_translate(struct phys_req *req, struct xen_blkif *blkif,
int operation)
{
struct vbd *vbd = &blkif->vbd;
Expand All @@ -186,7 +186,7 @@ static int vbd_translate(struct phys_req *req, struct blkif_st *blkif,
return rc;
}

static void vbd_resize(struct blkif_st *blkif)
static void vbd_resize(struct xen_blkif *blkif)
{
struct vbd *vbd = &blkif->vbd;
struct xenbus_transaction xbt;
Expand Down Expand Up @@ -233,7 +233,7 @@ static void vbd_resize(struct blkif_st *blkif)
/*
* Notification from the guest OS.
*/
static void blkif_notify_work(struct blkif_st *blkif)
static void blkif_notify_work(struct xen_blkif *blkif)
{
blkif->waiting_reqs = 1;
wake_up(&blkif->wq);
Expand All @@ -249,7 +249,7 @@ irqreturn_t xen_blkif_be_int(int irq, void *dev_id)
* SCHEDULER FUNCTIONS
*/

static void print_stats(struct blkif_st *blkif)
static void print_stats(struct xen_blkif *blkif)
{
pr_debug("xen-blkback (%s): oo %3d | rd %4d | wr %4d | f %4d\n",
current->comm, blkif->st_oo_req,
Expand All @@ -262,7 +262,7 @@ static void print_stats(struct blkif_st *blkif)

int xen_blkif_schedule(void *arg)
{
struct blkif_st *blkif = arg;
struct xen_blkif *blkif = arg;
struct vbd *vbd = &blkif->vbd;

xen_blkif_get(blkif);
Expand Down Expand Up @@ -451,7 +451,7 @@ static void end_block_io_op(struct bio *bio, int error)
* (which has the sectors we want, number of them, grant references, etc),
* and transmute it to the block API to hand it over to the proper block disk.
*/
static int do_block_io_op(struct blkif_st *blkif)
static int do_block_io_op(struct xen_blkif *blkif)
{
union blkif_back_rings *blk_rings = &blkif->blk_rings;
struct blkif_request req;
Expand Down Expand Up @@ -512,9 +512,9 @@ static int do_block_io_op(struct blkif_st *blkif)
* Transmutation of the 'struct blkif_request' to a proper 'struct bio'
* and call the 'submit_bio' to pass it to the underlying storage.
*/
static int dispatch_rw_block_io(struct blkif_st *blkif,
struct blkif_request *req,
struct pending_req *pending_req)
static int dispatch_rw_block_io(struct xen_blkif *blkif,
struct blkif_request *req,
struct pending_req *pending_req)
{
struct phys_req preq;
struct seg_buf seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
Expand Down Expand Up @@ -692,7 +692,7 @@ static int dispatch_rw_block_io(struct blkif_st *blkif,
/*
* Put a response on the ring on how the operation fared.
*/
static void make_response(struct blkif_st *blkif, u64 id,
static void make_response(struct xen_blkif *blkif, u64 id,
unsigned short op, int st)
{
struct blkif_response resp;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/block/xen-blkback/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ struct vbd {

struct backend_info;

struct blkif_st {
struct xen_blkif {
/* Unique identifier for this interface. */
domid_t domid;
unsigned int handle;
Expand Down
24 changes: 12 additions & 12 deletions trunk/drivers/block/xen-blkback/xenbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

struct backend_info {
struct xenbus_device *dev;
struct blkif_st *blkif;
struct xen_blkif *blkif;
struct xenbus_watch backend_watch;
unsigned major;
unsigned minor;
Expand All @@ -41,7 +41,7 @@ struct xenbus_device *xen_blkbk_xenbus(struct backend_info *be)
return be->dev;
}

static int blkback_name(struct blkif_st *blkif, char *buf)
static int blkback_name(struct xen_blkif *blkif, char *buf)
{
char *devpath, *devname;
struct xenbus_device *dev = blkif->be->dev;
Expand All @@ -62,7 +62,7 @@ static int blkback_name(struct blkif_st *blkif, char *buf)
return 0;
}

static void xen_update_blkif_status(struct blkif_st *blkif)
static void xen_update_blkif_status(struct xen_blkif *blkif)
{
int err;
char name[TASK_COMM_LEN];
Expand Down Expand Up @@ -101,9 +101,9 @@ static void xen_update_blkif_status(struct blkif_st *blkif)
}
}

static struct blkif_st *xen_blkif_alloc(domid_t domid)
static struct xen_blkif *xen_blkif_alloc(domid_t domid)
{
struct blkif_st *blkif;
struct xen_blkif *blkif;

blkif = kmem_cache_alloc(xen_blkif_cachep, GFP_KERNEL);
if (!blkif)
Expand All @@ -120,7 +120,7 @@ static struct blkif_st *xen_blkif_alloc(domid_t domid)
return blkif;
}

static int map_frontend_page(struct blkif_st *blkif, unsigned long shared_page)
static int map_frontend_page(struct xen_blkif *blkif, unsigned long shared_page)
{
struct gnttab_map_grant_ref op;

Expand All @@ -141,7 +141,7 @@ static int map_frontend_page(struct blkif_st *blkif, unsigned long shared_page)
return 0;
}

static void unmap_frontend_page(struct blkif_st *blkif)
static void unmap_frontend_page(struct xen_blkif *blkif)
{
struct gnttab_unmap_grant_ref op;

Expand All @@ -152,7 +152,7 @@ static void unmap_frontend_page(struct blkif_st *blkif)
BUG();
}

static int xen_blkif_map(struct blkif_st *blkif, unsigned long shared_page,
static int xen_blkif_map(struct xen_blkif *blkif, unsigned long shared_page,
unsigned int evtchn)
{
int err;
Expand Down Expand Up @@ -211,7 +211,7 @@ static int xen_blkif_map(struct blkif_st *blkif, unsigned long shared_page,
return 0;
}

static void xen_blkif_disconnect(struct blkif_st *blkif)
static void xen_blkif_disconnect(struct xen_blkif *blkif)
{
if (blkif->xenblkd) {
kthread_stop(blkif->xenblkd);
Expand All @@ -234,7 +234,7 @@ static void xen_blkif_disconnect(struct blkif_st *blkif)
}
}

void xen_blkif_free(struct blkif_st *blkif)
void xen_blkif_free(struct xen_blkif *blkif)
{
if (!atomic_dec_and_test(&blkif->refcnt))
BUG();
Expand All @@ -244,7 +244,7 @@ void xen_blkif_free(struct blkif_st *blkif)
int __init xen_blkif_interface_init(void)
{
xen_blkif_cachep = kmem_cache_create("blkif_cache",
sizeof(struct blkif_st),
sizeof(struct xen_blkif),
0, 0, NULL);
if (!xen_blkif_cachep)
return -ENOMEM;
Expand Down Expand Up @@ -332,7 +332,7 @@ static void vbd_free(struct vbd *vbd)
vbd->bdev = NULL;
}

static int vbd_create(struct blkif_st *blkif, blkif_vdev_t handle,
static int vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,
unsigned major, unsigned minor, int readonly,
int cdrom)
{
Expand Down

0 comments on commit b48118c

Please sign in to comment.