Commit e1c1b0fc authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: recv_resync_read(): Return 0 upon success and an error code otherwise 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 28284cef

drivers/block/drbd/drbd_receiver.c

+3 −3
Original line number Diff line number Diff line
@@ -1515,7 +1515,7 @@ static int recv_resync_read(struct drbd_conf *mdev, sector_t sector, int data_si 


	atomic_add(data_size >> 9, &mdev->rs_sect_ev);

	if (drbd_submit_peer_request(mdev, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)

		return true;

		return 0;



	/* don't care for the reason here */

	dev_err(DEV, "submit failed, triggering re-connect\n");
@@ -1526,7 +1526,7 @@ static int recv_resync_read(struct drbd_conf *mdev, sector_t sector, int data_si 
	drbd_free_ee(mdev, peer_req);

fail:

	put_ldev(mdev);

	return false;

	return -EIO;

}



static struct drbd_request *
@@ -1590,7 +1590,7 @@ static int receive_RSDataReply(struct drbd_conf *mdev, enum drbd_packet cmd, 
		/* data is submitted to disk within recv_resync_read.

		 * corresponding put_ldev done below on error,

		 * or in drbd_peer_request_endio. */

		ok = recv_resync_read(mdev, sector, data_size);

		ok = !recv_resync_read(mdev, sector, data_size);

	} else {

		if (__ratelimit(&drbd_ratelimit_state))

			dev_err(DEV, "Can not write resync data to local disk.\n");