Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes from Sage Weil: "There is an overflow bug fix for cephfs from Zheng, a fix for handling large authentication ticket buffers in libceph from Ilya, and a few fixes for the request handling code from Ilya that affect RBD volumes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: libceph: change from BUG to WARN for __remove_osd() asserts libceph: clear r_req_lru_item in __unregister_linger_request() libceph: unlink from o_linger_requests when clearing r_osd libceph: do not crash on large auth tickets ceph: fix flush tid comparision
This commit is contained in:
commit
b0ab3f190e
|
@ -2638,7 +2638,7 @@ static void handle_cap_flush_ack(struct inode *inode, u64 flush_tid,
|
||||||
|
|
||||||
for (i = 0; i < CEPH_CAP_BITS; i++)
|
for (i = 0; i < CEPH_CAP_BITS; i++)
|
||||||
if ((dirty & (1 << i)) &&
|
if ((dirty & (1 << i)) &&
|
||||||
flush_tid == ci->i_cap_flush_tid[i])
|
(u16)flush_tid == ci->i_cap_flush_tid[i])
|
||||||
cleaned |= 1 << i;
|
cleaned |= 1 << i;
|
||||||
|
|
||||||
dout("handle_cap_flush_ack inode %p mds%d seq %d on %s cleaned %s,"
|
dout("handle_cap_flush_ack inode %p mds%d seq %d on %s cleaned %s,"
|
||||||
|
|
|
@ -90,11 +90,82 @@ static struct crypto_blkcipher *ceph_crypto_alloc_cipher(void)
|
||||||
|
|
||||||
static const u8 *aes_iv = (u8 *)CEPH_AES_IV;
|
static const u8 *aes_iv = (u8 *)CEPH_AES_IV;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Should be used for buffers allocated with ceph_kvmalloc().
|
||||||
|
* Currently these are encrypt out-buffer (ceph_buffer) and decrypt
|
||||||
|
* in-buffer (msg front).
|
||||||
|
*
|
||||||
|
* Dispose of @sgt with teardown_sgtable().
|
||||||
|
*
|
||||||
|
* @prealloc_sg is to avoid memory allocation inside sg_alloc_table()
|
||||||
|
* in cases where a single sg is sufficient. No attempt to reduce the
|
||||||
|
* number of sgs by squeezing physically contiguous pages together is
|
||||||
|
* made though, for simplicity.
|
||||||
|
*/
|
||||||
|
static int setup_sgtable(struct sg_table *sgt, struct scatterlist *prealloc_sg,
|
||||||
|
const void *buf, unsigned int buf_len)
|
||||||
|
{
|
||||||
|
struct scatterlist *sg;
|
||||||
|
const bool is_vmalloc = is_vmalloc_addr(buf);
|
||||||
|
unsigned int off = offset_in_page(buf);
|
||||||
|
unsigned int chunk_cnt = 1;
|
||||||
|
unsigned int chunk_len = PAGE_ALIGN(off + buf_len);
|
||||||
|
int i;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (buf_len == 0) {
|
||||||
|
memset(sgt, 0, sizeof(*sgt));
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_vmalloc) {
|
||||||
|
chunk_cnt = chunk_len >> PAGE_SHIFT;
|
||||||
|
chunk_len = PAGE_SIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (chunk_cnt > 1) {
|
||||||
|
ret = sg_alloc_table(sgt, chunk_cnt, GFP_NOFS);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
} else {
|
||||||
|
WARN_ON(chunk_cnt != 1);
|
||||||
|
sg_init_table(prealloc_sg, 1);
|
||||||
|
sgt->sgl = prealloc_sg;
|
||||||
|
sgt->nents = sgt->orig_nents = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
for_each_sg(sgt->sgl, sg, sgt->orig_nents, i) {
|
||||||
|
struct page *page;
|
||||||
|
unsigned int len = min(chunk_len - off, buf_len);
|
||||||
|
|
||||||
|
if (is_vmalloc)
|
||||||
|
page = vmalloc_to_page(buf);
|
||||||
|
else
|
||||||
|
page = virt_to_page(buf);
|
||||||
|
|
||||||
|
sg_set_page(sg, page, len, off);
|
||||||
|
|
||||||
|
off = 0;
|
||||||
|
buf += len;
|
||||||
|
buf_len -= len;
|
||||||
|
}
|
||||||
|
WARN_ON(buf_len != 0);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void teardown_sgtable(struct sg_table *sgt)
|
||||||
|
{
|
||||||
|
if (sgt->orig_nents > 1)
|
||||||
|
sg_free_table(sgt);
|
||||||
|
}
|
||||||
|
|
||||||
static int ceph_aes_encrypt(const void *key, int key_len,
|
static int ceph_aes_encrypt(const void *key, int key_len,
|
||||||
void *dst, size_t *dst_len,
|
void *dst, size_t *dst_len,
|
||||||
const void *src, size_t src_len)
|
const void *src, size_t src_len)
|
||||||
{
|
{
|
||||||
struct scatterlist sg_in[2], sg_out[1];
|
struct scatterlist sg_in[2], prealloc_sg;
|
||||||
|
struct sg_table sg_out;
|
||||||
struct crypto_blkcipher *tfm = ceph_crypto_alloc_cipher();
|
struct crypto_blkcipher *tfm = ceph_crypto_alloc_cipher();
|
||||||
struct blkcipher_desc desc = { .tfm = tfm, .flags = 0 };
|
struct blkcipher_desc desc = { .tfm = tfm, .flags = 0 };
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -110,16 +181,18 @@ static int ceph_aes_encrypt(const void *key, int key_len,
|
||||||
|
|
||||||
*dst_len = src_len + zero_padding;
|
*dst_len = src_len + zero_padding;
|
||||||
|
|
||||||
crypto_blkcipher_setkey((void *)tfm, key, key_len);
|
|
||||||
sg_init_table(sg_in, 2);
|
sg_init_table(sg_in, 2);
|
||||||
sg_set_buf(&sg_in[0], src, src_len);
|
sg_set_buf(&sg_in[0], src, src_len);
|
||||||
sg_set_buf(&sg_in[1], pad, zero_padding);
|
sg_set_buf(&sg_in[1], pad, zero_padding);
|
||||||
sg_init_table(sg_out, 1);
|
ret = setup_sgtable(&sg_out, &prealloc_sg, dst, *dst_len);
|
||||||
sg_set_buf(sg_out, dst, *dst_len);
|
if (ret)
|
||||||
|
goto out_tfm;
|
||||||
|
|
||||||
|
crypto_blkcipher_setkey((void *)tfm, key, key_len);
|
||||||
iv = crypto_blkcipher_crt(tfm)->iv;
|
iv = crypto_blkcipher_crt(tfm)->iv;
|
||||||
ivsize = crypto_blkcipher_ivsize(tfm);
|
ivsize = crypto_blkcipher_ivsize(tfm);
|
||||||
|
|
||||||
memcpy(iv, aes_iv, ivsize);
|
memcpy(iv, aes_iv, ivsize);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
print_hex_dump(KERN_ERR, "enc key: ", DUMP_PREFIX_NONE, 16, 1,
|
print_hex_dump(KERN_ERR, "enc key: ", DUMP_PREFIX_NONE, 16, 1,
|
||||||
key, key_len, 1);
|
key, key_len, 1);
|
||||||
|
@ -128,16 +201,22 @@ static int ceph_aes_encrypt(const void *key, int key_len,
|
||||||
print_hex_dump(KERN_ERR, "enc pad: ", DUMP_PREFIX_NONE, 16, 1,
|
print_hex_dump(KERN_ERR, "enc pad: ", DUMP_PREFIX_NONE, 16, 1,
|
||||||
pad, zero_padding, 1);
|
pad, zero_padding, 1);
|
||||||
*/
|
*/
|
||||||
ret = crypto_blkcipher_encrypt(&desc, sg_out, sg_in,
|
ret = crypto_blkcipher_encrypt(&desc, sg_out.sgl, sg_in,
|
||||||
src_len + zero_padding);
|
src_len + zero_padding);
|
||||||
crypto_free_blkcipher(tfm);
|
if (ret < 0) {
|
||||||
if (ret < 0)
|
|
||||||
pr_err("ceph_aes_crypt failed %d\n", ret);
|
pr_err("ceph_aes_crypt failed %d\n", ret);
|
||||||
|
goto out_sg;
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
print_hex_dump(KERN_ERR, "enc out: ", DUMP_PREFIX_NONE, 16, 1,
|
print_hex_dump(KERN_ERR, "enc out: ", DUMP_PREFIX_NONE, 16, 1,
|
||||||
dst, *dst_len, 1);
|
dst, *dst_len, 1);
|
||||||
*/
|
*/
|
||||||
return 0;
|
|
||||||
|
out_sg:
|
||||||
|
teardown_sgtable(&sg_out);
|
||||||
|
out_tfm:
|
||||||
|
crypto_free_blkcipher(tfm);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ceph_aes_encrypt2(const void *key, int key_len, void *dst,
|
static int ceph_aes_encrypt2(const void *key, int key_len, void *dst,
|
||||||
|
@ -145,7 +224,8 @@ static int ceph_aes_encrypt2(const void *key, int key_len, void *dst,
|
||||||
const void *src1, size_t src1_len,
|
const void *src1, size_t src1_len,
|
||||||
const void *src2, size_t src2_len)
|
const void *src2, size_t src2_len)
|
||||||
{
|
{
|
||||||
struct scatterlist sg_in[3], sg_out[1];
|
struct scatterlist sg_in[3], prealloc_sg;
|
||||||
|
struct sg_table sg_out;
|
||||||
struct crypto_blkcipher *tfm = ceph_crypto_alloc_cipher();
|
struct crypto_blkcipher *tfm = ceph_crypto_alloc_cipher();
|
||||||
struct blkcipher_desc desc = { .tfm = tfm, .flags = 0 };
|
struct blkcipher_desc desc = { .tfm = tfm, .flags = 0 };
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -161,17 +241,19 @@ static int ceph_aes_encrypt2(const void *key, int key_len, void *dst,
|
||||||
|
|
||||||
*dst_len = src1_len + src2_len + zero_padding;
|
*dst_len = src1_len + src2_len + zero_padding;
|
||||||
|
|
||||||
crypto_blkcipher_setkey((void *)tfm, key, key_len);
|
|
||||||
sg_init_table(sg_in, 3);
|
sg_init_table(sg_in, 3);
|
||||||
sg_set_buf(&sg_in[0], src1, src1_len);
|
sg_set_buf(&sg_in[0], src1, src1_len);
|
||||||
sg_set_buf(&sg_in[1], src2, src2_len);
|
sg_set_buf(&sg_in[1], src2, src2_len);
|
||||||
sg_set_buf(&sg_in[2], pad, zero_padding);
|
sg_set_buf(&sg_in[2], pad, zero_padding);
|
||||||
sg_init_table(sg_out, 1);
|
ret = setup_sgtable(&sg_out, &prealloc_sg, dst, *dst_len);
|
||||||
sg_set_buf(sg_out, dst, *dst_len);
|
if (ret)
|
||||||
|
goto out_tfm;
|
||||||
|
|
||||||
|
crypto_blkcipher_setkey((void *)tfm, key, key_len);
|
||||||
iv = crypto_blkcipher_crt(tfm)->iv;
|
iv = crypto_blkcipher_crt(tfm)->iv;
|
||||||
ivsize = crypto_blkcipher_ivsize(tfm);
|
ivsize = crypto_blkcipher_ivsize(tfm);
|
||||||
|
|
||||||
memcpy(iv, aes_iv, ivsize);
|
memcpy(iv, aes_iv, ivsize);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
print_hex_dump(KERN_ERR, "enc key: ", DUMP_PREFIX_NONE, 16, 1,
|
print_hex_dump(KERN_ERR, "enc key: ", DUMP_PREFIX_NONE, 16, 1,
|
||||||
key, key_len, 1);
|
key, key_len, 1);
|
||||||
|
@ -182,23 +264,30 @@ static int ceph_aes_encrypt2(const void *key, int key_len, void *dst,
|
||||||
print_hex_dump(KERN_ERR, "enc pad: ", DUMP_PREFIX_NONE, 16, 1,
|
print_hex_dump(KERN_ERR, "enc pad: ", DUMP_PREFIX_NONE, 16, 1,
|
||||||
pad, zero_padding, 1);
|
pad, zero_padding, 1);
|
||||||
*/
|
*/
|
||||||
ret = crypto_blkcipher_encrypt(&desc, sg_out, sg_in,
|
ret = crypto_blkcipher_encrypt(&desc, sg_out.sgl, sg_in,
|
||||||
src1_len + src2_len + zero_padding);
|
src1_len + src2_len + zero_padding);
|
||||||
crypto_free_blkcipher(tfm);
|
if (ret < 0) {
|
||||||
if (ret < 0)
|
|
||||||
pr_err("ceph_aes_crypt2 failed %d\n", ret);
|
pr_err("ceph_aes_crypt2 failed %d\n", ret);
|
||||||
|
goto out_sg;
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
print_hex_dump(KERN_ERR, "enc out: ", DUMP_PREFIX_NONE, 16, 1,
|
print_hex_dump(KERN_ERR, "enc out: ", DUMP_PREFIX_NONE, 16, 1,
|
||||||
dst, *dst_len, 1);
|
dst, *dst_len, 1);
|
||||||
*/
|
*/
|
||||||
return 0;
|
|
||||||
|
out_sg:
|
||||||
|
teardown_sgtable(&sg_out);
|
||||||
|
out_tfm:
|
||||||
|
crypto_free_blkcipher(tfm);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ceph_aes_decrypt(const void *key, int key_len,
|
static int ceph_aes_decrypt(const void *key, int key_len,
|
||||||
void *dst, size_t *dst_len,
|
void *dst, size_t *dst_len,
|
||||||
const void *src, size_t src_len)
|
const void *src, size_t src_len)
|
||||||
{
|
{
|
||||||
struct scatterlist sg_in[1], sg_out[2];
|
struct sg_table sg_in;
|
||||||
|
struct scatterlist sg_out[2], prealloc_sg;
|
||||||
struct crypto_blkcipher *tfm = ceph_crypto_alloc_cipher();
|
struct crypto_blkcipher *tfm = ceph_crypto_alloc_cipher();
|
||||||
struct blkcipher_desc desc = { .tfm = tfm };
|
struct blkcipher_desc desc = { .tfm = tfm };
|
||||||
char pad[16];
|
char pad[16];
|
||||||
|
@ -210,16 +299,16 @@ static int ceph_aes_decrypt(const void *key, int key_len,
|
||||||
if (IS_ERR(tfm))
|
if (IS_ERR(tfm))
|
||||||
return PTR_ERR(tfm);
|
return PTR_ERR(tfm);
|
||||||
|
|
||||||
crypto_blkcipher_setkey((void *)tfm, key, key_len);
|
|
||||||
sg_init_table(sg_in, 1);
|
|
||||||
sg_init_table(sg_out, 2);
|
sg_init_table(sg_out, 2);
|
||||||
sg_set_buf(sg_in, src, src_len);
|
|
||||||
sg_set_buf(&sg_out[0], dst, *dst_len);
|
sg_set_buf(&sg_out[0], dst, *dst_len);
|
||||||
sg_set_buf(&sg_out[1], pad, sizeof(pad));
|
sg_set_buf(&sg_out[1], pad, sizeof(pad));
|
||||||
|
ret = setup_sgtable(&sg_in, &prealloc_sg, src, src_len);
|
||||||
|
if (ret)
|
||||||
|
goto out_tfm;
|
||||||
|
|
||||||
|
crypto_blkcipher_setkey((void *)tfm, key, key_len);
|
||||||
iv = crypto_blkcipher_crt(tfm)->iv;
|
iv = crypto_blkcipher_crt(tfm)->iv;
|
||||||
ivsize = crypto_blkcipher_ivsize(tfm);
|
ivsize = crypto_blkcipher_ivsize(tfm);
|
||||||
|
|
||||||
memcpy(iv, aes_iv, ivsize);
|
memcpy(iv, aes_iv, ivsize);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -228,12 +317,10 @@ static int ceph_aes_decrypt(const void *key, int key_len,
|
||||||
print_hex_dump(KERN_ERR, "dec in: ", DUMP_PREFIX_NONE, 16, 1,
|
print_hex_dump(KERN_ERR, "dec in: ", DUMP_PREFIX_NONE, 16, 1,
|
||||||
src, src_len, 1);
|
src, src_len, 1);
|
||||||
*/
|
*/
|
||||||
|
ret = crypto_blkcipher_decrypt(&desc, sg_out, sg_in.sgl, src_len);
|
||||||
ret = crypto_blkcipher_decrypt(&desc, sg_out, sg_in, src_len);
|
|
||||||
crypto_free_blkcipher(tfm);
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
pr_err("ceph_aes_decrypt failed %d\n", ret);
|
pr_err("ceph_aes_decrypt failed %d\n", ret);
|
||||||
return ret;
|
goto out_sg;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src_len <= *dst_len)
|
if (src_len <= *dst_len)
|
||||||
|
@ -251,7 +338,12 @@ static int ceph_aes_decrypt(const void *key, int key_len,
|
||||||
print_hex_dump(KERN_ERR, "dec out: ", DUMP_PREFIX_NONE, 16, 1,
|
print_hex_dump(KERN_ERR, "dec out: ", DUMP_PREFIX_NONE, 16, 1,
|
||||||
dst, *dst_len, 1);
|
dst, *dst_len, 1);
|
||||||
*/
|
*/
|
||||||
return 0;
|
|
||||||
|
out_sg:
|
||||||
|
teardown_sgtable(&sg_in);
|
||||||
|
out_tfm:
|
||||||
|
crypto_free_blkcipher(tfm);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ceph_aes_decrypt2(const void *key, int key_len,
|
static int ceph_aes_decrypt2(const void *key, int key_len,
|
||||||
|
@ -259,7 +351,8 @@ static int ceph_aes_decrypt2(const void *key, int key_len,
|
||||||
void *dst2, size_t *dst2_len,
|
void *dst2, size_t *dst2_len,
|
||||||
const void *src, size_t src_len)
|
const void *src, size_t src_len)
|
||||||
{
|
{
|
||||||
struct scatterlist sg_in[1], sg_out[3];
|
struct sg_table sg_in;
|
||||||
|
struct scatterlist sg_out[3], prealloc_sg;
|
||||||
struct crypto_blkcipher *tfm = ceph_crypto_alloc_cipher();
|
struct crypto_blkcipher *tfm = ceph_crypto_alloc_cipher();
|
||||||
struct blkcipher_desc desc = { .tfm = tfm };
|
struct blkcipher_desc desc = { .tfm = tfm };
|
||||||
char pad[16];
|
char pad[16];
|
||||||
|
@ -271,17 +364,17 @@ static int ceph_aes_decrypt2(const void *key, int key_len,
|
||||||
if (IS_ERR(tfm))
|
if (IS_ERR(tfm))
|
||||||
return PTR_ERR(tfm);
|
return PTR_ERR(tfm);
|
||||||
|
|
||||||
sg_init_table(sg_in, 1);
|
|
||||||
sg_set_buf(sg_in, src, src_len);
|
|
||||||
sg_init_table(sg_out, 3);
|
sg_init_table(sg_out, 3);
|
||||||
sg_set_buf(&sg_out[0], dst1, *dst1_len);
|
sg_set_buf(&sg_out[0], dst1, *dst1_len);
|
||||||
sg_set_buf(&sg_out[1], dst2, *dst2_len);
|
sg_set_buf(&sg_out[1], dst2, *dst2_len);
|
||||||
sg_set_buf(&sg_out[2], pad, sizeof(pad));
|
sg_set_buf(&sg_out[2], pad, sizeof(pad));
|
||||||
|
ret = setup_sgtable(&sg_in, &prealloc_sg, src, src_len);
|
||||||
|
if (ret)
|
||||||
|
goto out_tfm;
|
||||||
|
|
||||||
crypto_blkcipher_setkey((void *)tfm, key, key_len);
|
crypto_blkcipher_setkey((void *)tfm, key, key_len);
|
||||||
iv = crypto_blkcipher_crt(tfm)->iv;
|
iv = crypto_blkcipher_crt(tfm)->iv;
|
||||||
ivsize = crypto_blkcipher_ivsize(tfm);
|
ivsize = crypto_blkcipher_ivsize(tfm);
|
||||||
|
|
||||||
memcpy(iv, aes_iv, ivsize);
|
memcpy(iv, aes_iv, ivsize);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -290,12 +383,10 @@ static int ceph_aes_decrypt2(const void *key, int key_len,
|
||||||
print_hex_dump(KERN_ERR, "dec in: ", DUMP_PREFIX_NONE, 16, 1,
|
print_hex_dump(KERN_ERR, "dec in: ", DUMP_PREFIX_NONE, 16, 1,
|
||||||
src, src_len, 1);
|
src, src_len, 1);
|
||||||
*/
|
*/
|
||||||
|
ret = crypto_blkcipher_decrypt(&desc, sg_out, sg_in.sgl, src_len);
|
||||||
ret = crypto_blkcipher_decrypt(&desc, sg_out, sg_in, src_len);
|
|
||||||
crypto_free_blkcipher(tfm);
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
pr_err("ceph_aes_decrypt failed %d\n", ret);
|
pr_err("ceph_aes_decrypt failed %d\n", ret);
|
||||||
return ret;
|
goto out_sg;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src_len <= *dst1_len)
|
if (src_len <= *dst1_len)
|
||||||
|
@ -325,7 +416,11 @@ static int ceph_aes_decrypt2(const void *key, int key_len,
|
||||||
dst2, *dst2_len, 1);
|
dst2, *dst2_len, 1);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
return 0;
|
out_sg:
|
||||||
|
teardown_sgtable(&sg_in);
|
||||||
|
out_tfm:
|
||||||
|
crypto_free_blkcipher(tfm);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1007,8 +1007,8 @@ static void put_osd(struct ceph_osd *osd)
|
||||||
static void __remove_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd)
|
static void __remove_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd)
|
||||||
{
|
{
|
||||||
dout("__remove_osd %p\n", osd);
|
dout("__remove_osd %p\n", osd);
|
||||||
BUG_ON(!list_empty(&osd->o_requests));
|
WARN_ON(!list_empty(&osd->o_requests));
|
||||||
BUG_ON(!list_empty(&osd->o_linger_requests));
|
WARN_ON(!list_empty(&osd->o_linger_requests));
|
||||||
|
|
||||||
rb_erase(&osd->o_node, &osdc->osds);
|
rb_erase(&osd->o_node, &osdc->osds);
|
||||||
list_del_init(&osd->o_osd_lru);
|
list_del_init(&osd->o_osd_lru);
|
||||||
|
@ -1254,6 +1254,8 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc,
|
||||||
if (list_empty(&req->r_osd_item))
|
if (list_empty(&req->r_osd_item))
|
||||||
req->r_osd = NULL;
|
req->r_osd = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
list_del_init(&req->r_req_lru_item); /* can be on notarget */
|
||||||
ceph_osdc_put_request(req);
|
ceph_osdc_put_request(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1395,6 +1397,7 @@ static int __map_request(struct ceph_osd_client *osdc,
|
||||||
if (req->r_osd) {
|
if (req->r_osd) {
|
||||||
__cancel_request(req);
|
__cancel_request(req);
|
||||||
list_del_init(&req->r_osd_item);
|
list_del_init(&req->r_osd_item);
|
||||||
|
list_del_init(&req->r_linger_osd_item);
|
||||||
req->r_osd = NULL;
|
req->r_osd = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue