Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / lib / flex_array.c

diff --git a/lib/flex_array.c b/lib/flex_array.c
index 854b57b..cab7621 100644 (file)
--- a/lib/flex_array.c
+++ b/lib/flex_array.c
@@ -88,8 +88,11 @@ struct flex_array *flex_array_alloc(int element_size, unsigned int total,
                                        gfp_t flags)
 {
        struct flex_array *ret;
-       int max_size = FLEX_ARRAY_NR_BASE_PTRS *
-                               FLEX_ARRAY_ELEMENTS_PER_PART(element_size);
+       int max_size = 0;
+
+       if (element_size)
+               max_size = FLEX_ARRAY_NR_BASE_PTRS *
+                          FLEX_ARRAY_ELEMENTS_PER_PART(element_size);
 
        /* max_size will end up 0 if element_size > PAGE_SIZE */
        if (total > max_size)
@@ -183,15 +186,18 @@ __fa_get_part(struct flex_array *fa, int part_nr, gfp_t flags)
 int flex_array_put(struct flex_array *fa, unsigned int element_nr, void *src,
                        gfp_t flags)
 {
-       int part_nr = fa_element_to_part_nr(fa, element_nr);
+       int part_nr;
        struct flex_array_part *part;
        void *dst;
 
        if (element_nr >= fa->total_nr_elements)
                return -ENOSPC;
+       if (!fa->element_size)
+               return 0;
        if (elements_fit_in_base(fa))
                part = (struct flex_array_part *)&fa->parts[0];
        else {
+               part_nr = fa_element_to_part_nr(fa, element_nr);
                part = __fa_get_part(fa, part_nr, flags);
                if (!part)
                        return -ENOMEM;
@@ -211,15 +217,18 @@ EXPORT_SYMBOL(flex_array_put);
  */
 int flex_array_clear(struct flex_array *fa, unsigned int element_nr)
 {
-       int part_nr = fa_element_to_part_nr(fa, element_nr);
+       int part_nr;
        struct flex_array_part *part;
        void *dst;
 
        if (element_nr >= fa->total_nr_elements)
                return -ENOSPC;
+       if (!fa->element_size)
+               return 0;
        if (elements_fit_in_base(fa))
                part = (struct flex_array_part *)&fa->parts[0];
        else {
+               part_nr = fa_element_to_part_nr(fa, element_nr);
                part = fa->parts[part_nr];
                if (!part)
                        return -EINVAL;
@@ -264,6 +273,8 @@ int flex_array_prealloc(struct flex_array *fa, unsigned int start,
 
        if (end >= fa->total_nr_elements)
                return -ENOSPC;
+       if (!fa->element_size)
+               return 0;
        if (elements_fit_in_base(fa))
                return 0;
        start_part = fa_element_to_part_nr(fa, start);
@@ -291,14 +302,17 @@ EXPORT_SYMBOL(flex_array_prealloc);
  */
 void *flex_array_get(struct flex_array *fa, unsigned int element_nr)
 {
-       int part_nr = fa_element_to_part_nr(fa, element_nr);
+       int part_nr;
        struct flex_array_part *part;
 
+       if (!fa->element_size)
+               return NULL;
        if (element_nr >= fa->total_nr_elements)
                return NULL;
        if (elements_fit_in_base(fa))
                part = (struct flex_array_part *)&fa->parts[0];
        else {
+               part_nr = fa_element_to_part_nr(fa, element_nr);
                part = fa->parts[part_nr];
                if (!part)
                        return NULL;
@@ -353,7 +367,7 @@ int flex_array_shrink(struct flex_array *fa)
        int part_nr;
        int ret = 0;
 
-       if (!fa->total_nr_elements)
+       if (!fa->total_nr_elements || !fa->element_size)
                return 0;
        if (elements_fit_in_base(fa))
                return ret;