>I think in this case we don't want to drop other caps. This basically
>means we weren't able to maintain the desired level of reserves, but we
>will continue to try to fill it periodically, and not reaching the desired
>point is not a reason to throw out what we have. You'll note that the one
>caller ignores the return value..
>
I see.But the code don't.
> for (i = have; i < need; i++) {
> cap = kmem_cache_alloc(ceph_cap_cachep, GFP_NOFS);
> if (!cap) {
> ret = -ENOMEM;
> goto out_alloc_count;
> }
> list_add(&cap->caps_item, &newcaps);
> alloc++;
> }
> BUG_ON(have + alloc != need);
For the caps which allocated, those can't add into '&mdsc->caps_list'.
So if allocate failed,it will cause memory leak.
By your thought, the code maybe like
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index da0f9b8..d5d5eca 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -176,12 +176,11 @@ int ceph_reserve_caps(struct ceph_mds_client *mdsc,
cap = kmem_cache_alloc(ceph_cap_cachep, GFP_NOFS);
if (!cap) {
ret = -ENOMEM;
- goto out_alloc_count;
+ break;
}
list_add(&cap->caps_item, &newcaps);
alloc++;
}
- BUG_ON(have + alloc != need);
spin_lock(&mdsc->caps_list_lock);
mdsc->caps_total_count += alloc;
BTY, The function which call ceph_reserve_caps don't care the result.
And from you comment, this will periodically do.So i think the function proto will be
viod ceph_reserve_caps()
{
}
How about this?
Thanks!
Jianpeng Ma
>sage
>
>
>On Tue, 25 Jun 2013, majianpeng wrote:
>
>> Signed-off-by: Jianpeng Ma <majianpeng@xxxxxxxxx>
>> ---
>> fs/ceph/caps.c | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
>> index da0f9b8..626b0ec 100644
>> --- a/fs/ceph/caps.c
>> +++ b/fs/ceph/caps.c
>> @@ -203,6 +203,11 @@ out_alloc_count:
>> /* we didn't manage to reserve as much as we needed */
>> pr_warning("reserve caps ctx=%p ENOMEM need=%d got=%d\n",
>> ctx, need, have);
>> + if (alloc) {
>> + struct ceph_cap *tmp;
>> + list_for_each_entry_safe(cap, tmp, &newcaps, caps_item)
>> + kmem_cache_free(ceph_cap_cachep, cap);
>> + }
>> return ret;
>> }
>>
>> --
>> 1.8.1.2
>> ?韬{.n?????%??檩??w?{.n????u朕?Ф?塄}?财??j:+v?? ? ???2??璀??摺?囤??z夸z罐?+?????w棹f
