Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 09:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

drbd: Rename drbd_submit_ee -> drbd_submit_peer_request

Browse Source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Andreas Gruenbacher 2011-02-17 16:38:35 +01:00 committed by Philipp Reisner
parent df24aa45f4
commit fbe29dec98
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/block/drbd/drbd_int.h
View File

@ -1532,8 +1532,9 @@ extern void start_resync_timer_fn(unsigned long data);
/* drbd_receiver.c */
extern int drbd_rs_should_slow_down(struct drbd_conf *mdev, sector_t sector);
extern int drbd_submit_ee(struct drbd_conf *, struct drbd_peer_request *,
const unsigned, const int);
extern int drbd_submit_peer_request(struct drbd_conf *,
struct drbd_peer_request *, const unsigned,
const int);
extern int drbd_release_ee(struct drbd_conf *mdev, struct list_head *list);
extern struct drbd_peer_request *drbd_alloc_ee(struct drbd_conf *,
u64, sector_t, unsigned int,

13
drivers/block/drbd/drbd_receiver.c
View File

@ -1092,7 +1092,7 @@ void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo)
}
/**
* drbd_submit_ee()
* drbd_submit_peer_request()
* @mdev: DRBD device.
* @peer_req: peer request
* @rw: flag field, see bio->bi_rw
@ -1108,8 +1108,9 @@ void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo)
* on certain Xen deployments.
*/
/* TODO allocate from our own bio_set. */
int drbd_submit_ee(struct drbd_conf *mdev, struct drbd_peer_request *peer_req,
const unsigned rw, const int fault_type)
int drbd_submit_peer_request(struct drbd_conf *mdev,
struct drbd_peer_request *peer_req,
const unsigned rw, const int fault_type)
{
struct bio *bios = NULL;
struct bio *bio;
@ -1496,7 +1497,7 @@ static int recv_resync_read(struct drbd_conf *mdev, sector_t sector, int data_si
spin_unlock_irq(&mdev->tconn->req_lock);
atomic_add(data_size >> 9, &mdev->rs_sect_ev);
if (drbd_submit_ee(mdev, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
if (drbd_submit_peer_request(mdev, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
return true;
/* don't care for the reason here */
@ -1936,7 +1937,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packet cmd,
drbd_al_begin_io(mdev, peer_req->i.sector);
}
if (drbd_submit_ee(mdev, peer_req, rw, DRBD_FAULT_DT_WR) == 0)
if (drbd_submit_peer_request(mdev, peer_req, rw, DRBD_FAULT_DT_WR) == 0)
return true;
/* don't care for the reason here */
@ -2193,7 +2194,7 @@ submit:
list_add_tail(&peer_req->w.list, &mdev->read_ee);
spin_unlock_irq(&mdev->tconn->req_lock);
if (drbd_submit_ee(mdev, peer_req, READ, fault_type) == 0)
if (drbd_submit_peer_request(mdev, peer_req, READ, fault_type) == 0)
return true;
/* don't care for the reason here */

2
drivers/block/drbd/drbd_worker.c
View File

@ -365,7 +365,7 @@ static int read_for_csum(struct drbd_conf *mdev, sector_t sector, int size)
spin_unlock_irq(&mdev->tconn->req_lock);
atomic_add(size >> 9, &mdev->rs_sect_ev);
if (drbd_submit_ee(mdev, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
if (drbd_submit_peer_request(mdev, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
return 0;
/* If it failed because of ENOMEM, retry should help. If it failed