浏览代码

libceph: make ceph_msg_data_advance() return void

Both callers ignore the returned bool.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Ilya Dryomov 8 年之前
父节点
当前提交
1759f7b0e3
共有 1 个文件被更改,包括 4 次插入7 次删除
  1. 4 7
      net/ceph/messenger.c

+ 4 - 7
net/ceph/messenger.c

@@ -1174,8 +1174,8 @@ static struct page *ceph_msg_data_next(struct ceph_msg_data_cursor *cursor,
  * Returns true if the result moves the cursor on to the next piece
  * Returns true if the result moves the cursor on to the next piece
  * of the data item.
  * of the data item.
  */
  */
-static bool ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,
-				size_t bytes)
+static void ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,
+				  size_t bytes)
 {
 {
 	bool new_piece;
 	bool new_piece;
 
 
@@ -1207,8 +1207,6 @@ static bool ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,
 		new_piece = true;
 		new_piece = true;
 	}
 	}
 	cursor->need_crc = new_piece;
 	cursor->need_crc = new_piece;
-
-	return new_piece;
 }
 }
 
 
 static size_t sizeof_footer(struct ceph_connection *con)
 static size_t sizeof_footer(struct ceph_connection *con)
@@ -1577,7 +1575,6 @@ static int write_partial_message_data(struct ceph_connection *con)
 		size_t page_offset;
 		size_t page_offset;
 		size_t length;
 		size_t length;
 		bool last_piece;
 		bool last_piece;
-		bool need_crc;
 		int ret;
 		int ret;
 
 
 		page = ceph_msg_data_next(cursor, &page_offset, &length,
 		page = ceph_msg_data_next(cursor, &page_offset, &length,
@@ -1592,7 +1589,7 @@ static int write_partial_message_data(struct ceph_connection *con)
 		}
 		}
 		if (do_datacrc && cursor->need_crc)
 		if (do_datacrc && cursor->need_crc)
 			crc = ceph_crc32c_page(crc, page, page_offset, length);
 			crc = ceph_crc32c_page(crc, page, page_offset, length);
-		need_crc = ceph_msg_data_advance(cursor, (size_t)ret);
+		ceph_msg_data_advance(cursor, (size_t)ret);
 	}
 	}
 
 
 	dout("%s %p msg %p done\n", __func__, con, msg);
 	dout("%s %p msg %p done\n", __func__, con, msg);
@@ -2299,7 +2296,7 @@ static int read_partial_msg_data(struct ceph_connection *con)
 
 
 		if (do_datacrc)
 		if (do_datacrc)
 			crc = ceph_crc32c_page(crc, page, page_offset, ret);
 			crc = ceph_crc32c_page(crc, page, page_offset, ret);
-		(void) ceph_msg_data_advance(cursor, (size_t)ret);
+		ceph_msg_data_advance(cursor, (size_t)ret);
 	}
 	}
 	if (do_datacrc)
 	if (do_datacrc)
 		con->in_data_crc = crc;
 		con->in_data_crc = crc;