drbd: Rename various functions from *_oos_* to *_out_of_sync_* for clarity (8f7bed77) · Commits · 戴 / test

drivers/block/drbd/drbd_int.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -1191,7 +1191,7 @@ extern void drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packet cmd,
		struct p_data *dp, int data_size);
		extern int drbd_send_ack_ex(struct drbd_conf *mdev, enum drbd_packet cmd,
		sector_t sector, int blksize, u64 block_id);
		extern int drbd_send_oos(struct drbd_conf mdev, struct drbd_request req);
		extern int drbd_send_out_of_sync(struct drbd_conf , struct drbd_request );
		extern int drbd_send_block(struct drbd_conf *, enum drbd_packet,
		struct drbd_peer_request *);
		extern int drbd_send_dblock(struct drbd_conf mdev, struct drbd_request req);
		@@ -1528,10 +1528,10 @@ extern int drbd_resync_finished(struct drbd_conf *mdev);
		/* maybe rather drbd_main.c ? */
		extern int drbd_md_sync_page_io(struct drbd_conf *mdev,
		struct drbd_backing_dev *bdev, sector_t sector, int rw);
		extern void drbd_ov_oos_found(struct drbd_conf*, sector_t, int);
		extern void drbd_ov_out_of_sync_found(struct drbd_conf *, sector_t, int);
		extern void drbd_rs_controller_reset(struct drbd_conf *mdev);

		static inline void ov_oos_print(struct drbd_conf *mdev)
		static inline void ov_out_of_sync_print(struct drbd_conf *mdev)
		{
		if (mdev->ov_last_oos_size) {
		dev_err(DEV, "Out of sync: start=%llu, size=%lu (sectors)\n",
		@@ -1562,7 +1562,7 @@ extern int w_send_read_req(struct drbd_work *, int);
		extern int w_prev_work_done(struct drbd_work *, int);
		extern int w_e_reissue(struct drbd_work *, int);
		extern int w_restart_disk_io(struct drbd_work *, int);
		extern int w_send_oos(struct drbd_work *, int);
		extern int w_send_out_of_sync(struct drbd_work *, int);
		extern int w_start_resync(struct drbd_work *, int);

		extern void resync_timer_fn(unsigned long data);

drivers/block/drbd/drbd_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1652,7 +1652,7 @@ int drbd_send_block(struct drbd_conf *mdev, enum drbd_packet cmd,
		return err;
		}

		int drbd_send_oos(struct drbd_conf mdev, struct drbd_request req)
		int drbd_send_out_of_sync(struct drbd_conf mdev, struct drbd_request req)
		{
		struct p_block_desc p;

drivers/block/drbd/drbd_receiver.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -4699,9 +4699,9 @@ static int got_OVResult(struct drbd_conf *mdev, enum drbd_packet cmd)
		update_peer_seq(mdev, be32_to_cpu(p->seq_num));

		if (be64_to_cpu(p->block_id) == ID_OUT_OF_SYNC)
		drbd_ov_oos_found(mdev, sector, size);
		drbd_ov_out_of_sync_found(mdev, sector, size);
		else
		ov_oos_print(mdev);
		ov_out_of_sync_print(mdev);

		if (!get_ldev(mdev))
		return true;
		@@ -4723,7 +4723,7 @@ static int got_OVResult(struct drbd_conf *mdev, enum drbd_packet cmd)
		drbd_queue_work_front(&mdev->tconn->data.work, w);
		} else {
		dev_err(DEV, "kmalloc(w) failed.");
		ov_oos_print(mdev);
		ov_out_of_sync_print(mdev);
		drbd_resync_finished(mdev);
		}
		}

drivers/block/drbd/drbd_req.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -477,7 +477,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,

		case QUEUE_FOR_SEND_OOS:
		req->rq_state \|= RQ_NET_QUEUED;
		req->w.cb = w_send_oos;
		req->w.cb = w_send_out_of_sync;
		drbd_queue_work(&mdev->tconn->data.work, &req->w);
		break;

		@@ -786,7 +786,7 @@ int __drbd_make_request(struct drbd_conf mdev, struct bio bio, unsigned long s
		}

		remote = remote && drbd_should_do_remote(mdev->state);
		send_oos = rw == WRITE && drbd_should_send_oos(mdev->state);
		send_oos = rw == WRITE && drbd_should_send_out_of_sync(mdev->state);
		D_ASSERT(!(remote && send_oos));

		if (!(local \|\| remote) && !is_susp(mdev->state)) {
		@@ -842,7 +842,7 @@ allocate_barrier:

		if (remote \|\| send_oos) {
		remote = drbd_should_do_remote(mdev->state);
		send_oos = rw == WRITE && drbd_should_send_oos(mdev->state);
		send_oos = rw == WRITE && drbd_should_send_out_of_sync(mdev->state);
		D_ASSERT(!(remote && send_oos));

		if (!(remote \|\| send_oos))

drivers/block/drbd/drbd_req.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -305,7 +305,7 @@ static inline bool drbd_should_do_remote(union drbd_state s)
		That is equivalent since before 96 IO was frozen in the C_WF_BITMAP*
		states. */
		}
		static inline bool drbd_should_send_oos(union drbd_state s)
		static inline bool drbd_should_send_out_of_sync(union drbd_state s)
		{
		return s.conn == C_AHEAD \|\| s.conn == C_WF_BITMAP_S;
		/* pdsk = D_INCONSISTENT as a consequence. Protocol 96 check not necessary

Admin message