diff options
| author | Alex Elder | 2013-02-16 05:10:17 +0100 |
|---|---|---|
| committer | Sage Weil | 2013-05-02 06:14:23 +0200 |
| commit | 07c09b725543ff2958c11522d583f90f7fdba735 (patch) | |
| tree | e59ccdb0798fb56c4d2d34bbe1952b1de9cfdf6c /net/ceph/messenger.c | |
| parent | libceph: fix a osd request memory leak (diff) | |
| download | kernel-qcow2-linux-07c09b725543ff2958c11522d583f90f7fdba735.tar.gz kernel-qcow2-linux-07c09b725543ff2958c11522d583f90f7fdba735.tar.xz kernel-qcow2-linux-07c09b725543ff2958c11522d583f90f7fdba735.zip | |
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: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'net/ceph/messenger.c')
| -rw-r--r-- | net/ceph/messenger.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 2c0669fb54e3..c06f94009d73 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -697,18 +697,19 @@ static void con_out_kvec_add(struct ceph_connection *con, } #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) { - *iter = NULL; - *seg = 0; + *bio_iter = NULL; + *bio_seg = 0; return; } - *iter = bio; - *seg = bio->bi_idx; + *bio_iter = bio; + *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) return; @@ -1818,7 +1819,8 @@ static int read_partial_message_pages(struct ceph_connection *con, #ifdef CONFIG_BLOCK 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) { struct bio_vec *bv = bio_iovec_idx(*bio_iter, *bio_seg); |