Commit 07c09b72 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil

libceph: make ceph_msg->bio_seg be unsigned

The bio_seg field is used by the ceph messenger in iterating through
a bio.  It should never have a negative value, so make it an
unsigned.  (I contemplated making it unsigned short to match the
struct bio definition, but it offered no benefit.)

Change variables used to hold bio_seg values to all be unsigned as
well.  Change two variable names in init_bio_iter() to match the
convention used everywhere else.
Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 3ff5f385
...@@ -86,7 +86,7 @@ struct ceph_msg { ...@@ -86,7 +86,7 @@ struct ceph_msg {
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
struct bio *bio; /* instead of pages/pagelist */ struct bio *bio; /* instead of pages/pagelist */
struct bio *bio_iter; /* bio iterator */ struct bio *bio_iter; /* bio iterator */
int bio_seg; /* current bio segment */ unsigned int bio_seg; /* current bio segment */
#endif /* CONFIG_BLOCK */ #endif /* CONFIG_BLOCK */
struct ceph_pagelist *trail; /* the trailing part of the data */ struct ceph_pagelist *trail; /* the trailing part of the data */
bool front_is_vmalloc; bool front_is_vmalloc;
......
...@@ -697,18 +697,19 @@ static void con_out_kvec_add(struct ceph_connection *con, ...@@ -697,18 +697,19 @@ static void con_out_kvec_add(struct ceph_connection *con,
} }
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
static void init_bio_iter(struct bio *bio, struct bio **iter, int *seg) static void init_bio_iter(struct bio *bio, struct bio **bio_iter,
unsigned int *bio_seg)
{ {
if (!bio) { if (!bio) {
*iter = NULL; *bio_iter = NULL;
*seg = 0; *bio_seg = 0;
return; return;
} }
*iter = bio; *bio_iter = bio;
*seg = bio->bi_idx; *bio_seg = (unsigned int) bio->bi_idx;
} }
static void iter_bio_next(struct bio **bio_iter, int *seg) static void iter_bio_next(struct bio **bio_iter, unsigned int *seg)
{ {
if (*bio_iter == NULL) if (*bio_iter == NULL)
return; return;
...@@ -1818,7 +1819,8 @@ static int read_partial_message_pages(struct ceph_connection *con, ...@@ -1818,7 +1819,8 @@ static int read_partial_message_pages(struct ceph_connection *con,
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
static int read_partial_message_bio(struct ceph_connection *con, static int read_partial_message_bio(struct ceph_connection *con,
struct bio **bio_iter, int *bio_seg, struct bio **bio_iter,
unsigned int *bio_seg,
unsigned int data_len, bool do_datacrc) unsigned int data_len, bool do_datacrc)
{ {
struct bio_vec *bv = bio_iovec_idx(*bio_iter, *bio_seg); struct bio_vec *bv = bio_iovec_idx(*bio_iter, *bio_seg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment