Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164523
b: refs/heads/master
c: e6de398
h: refs/heads/master
i:
  164521: 3891150
  164519: a35d7fe
v: v3
  • Loading branch information
David Rientjes authored and Linus Torvalds committed Sep 22, 2009
1 parent 4d24bd8 commit 1fd2359
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2f30b1f9e1b612cdd1a17daeecf514229e8d6a5f
refs/heads/master: e6de3988aa52debb25a427d085061f3bf1181d54
1 change: 1 addition & 0 deletions trunk/include/linux/flex_array.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ void flex_array_free(struct flex_array *fa);
void flex_array_free_parts(struct flex_array *fa);
int flex_array_put(struct flex_array *fa, unsigned int element_nr, void *src,
gfp_t flags);
int flex_array_clear(struct flex_array *fa, unsigned int element_nr);
void *flex_array_get(struct flex_array *fa, unsigned int element_nr);

#endif /* _FLEX_ARRAY_H */
26 changes: 26 additions & 0 deletions trunk/lib/flex_array.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,32 @@ int flex_array_put(struct flex_array *fa, unsigned int element_nr, void *src,
return 0;
}

/**
* flex_array_clear - clear element in array at @element_nr
* @element_nr: index of the position to clear.
*
* Locking must be provided by the caller.
*/
int flex_array_clear(struct flex_array *fa, unsigned int element_nr)
{
int part_nr = fa_element_to_part_nr(fa, element_nr);
struct flex_array_part *part;
void *dst;

if (element_nr >= fa->total_nr_elements)
return -ENOSPC;
if (elements_fit_in_base(fa))
part = (struct flex_array_part *)&fa->parts[0];
else {
part = fa->parts[part_nr];
if (!part)
return -EINVAL;
}
dst = &part->elements[index_inside_part(fa, element_nr)];
memset(dst, 0, fa->element_size);
return 0;
}

/**
* flex_array_prealloc - guarantee that array space exists
* @start: index of first array element for which space is allocated
Expand Down

0 comments on commit 1fd2359

Please sign in to comment.