- removed non-existant issue from TODO file
kuid_t or uid_t not present in staging/android
- fixed 80 char limit exceeding line
- a newline after decelartions as per checkpatch.pl
- fixed an unnecessary typedef as reported by checkpatch.pl
---
drivers/staging/android/TODO | 7 -------
drivers/staging/android/ion/ion.c | 1 +
drivers/staging/android/ion/ion_chunk_heap.c | 4 ++--
drivers/staging/android/uapi/ion.h | 7 +++----
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/android/TODO b/drivers/staging/android/TODO
index 06954cd..b15fb0d 100644
--- a/drivers/staging/android/TODO
+++ b/drivers/staging/android/TODO
@@ -5,13 +5,6 @@ TODO:
- make sure things build as modules properly
- add proper arch dependencies as needed
- audit userspace interfaces to make sure they are sane
- - kuid_t should never be exposed to user space as it is
- kernel internal type. Data structure for this kuid_t is:
- typedef struct {
- uid_t val;
- } kuid_t;
- - This bug is introduced by Xiong Zhou in the patch bd471258f2e09
- - ("staging: android: logger: use kuid_t instead of uid_t")
Please send patches to Greg Kroah-Hartman <[email protected]> and Cc:
Brian Swetland <[email protected]>
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 6f48112..e44f5e6 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1106,6 +1106,7 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client,
struct ion_buffer *buffer;
struct dma_buf *dmabuf;
bool valid_handle;
+
DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
mutex_lock(&client->lock);
diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
index 5474615..0813163 100644
--- a/drivers/staging/android/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/ion/ion_chunk_heap.c
@@ -173,8 +173,8 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data)
chunk_heap->heap.ops = &chunk_heap_ops;
chunk_heap->heap.type = ION_HEAP_TYPE_CHUNK;
chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE;
- pr_debug("%s: base %lu size %zu align %ld\n", __func__, chunk_heap->base,
- heap_data->size, heap_data->align);
+ pr_debug("%s: base %lu size %zu align %ld\n", __func__,
+ chunk_heap->base, heap_data->size, heap_data->align);
return &chunk_heap->heap;
diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h
index 68a14b4..9897403 100644
--- a/drivers/staging/android/uapi/ion.h
+++ b/drivers/staging/android/uapi/ion.h
@@ -20,7 +20,6 @@
#include <linux/ioctl.h>
#include <linux/types.h>
-typedef int ion_user_handle_t;
/**
* enum ion_heap_types - list of all possible types of heaps
@@ -88,7 +87,7 @@ struct ion_allocation_data {
size_t align;
unsigned int heap_id_mask;
unsigned int flags;
- ion_user_handle_t handle;
+ int handle;
};
/**
@@ -102,7 +101,7 @@ struct ion_allocation_data {
* provides the file descriptor and the kernel returns the handle.
*/
struct ion_fd_data {
- ion_user_handle_t handle;
+ int handle;
int fd;
};
@@ -111,7 +110,7 @@ struct ion_fd_data {
* @handle: a handle
*/
struct ion_handle_data {
- ion_user_handle_t handle;
+ int handle;
};
/**
--
On Wed, Jul 1, 2015 at 1:56 PM, Sohny Thomas <[email protected]> wrote:
> - removed non-existant issue from TODO file
s,existant,existent,
> kuid_t or uid_t not present in staging/android
> - fixed 80 char limit exceeding line
> - a newline after decelartions as per checkpatch.pl
> - fixed an unnecessary typedef as reported by checkpatch.pl
Fix one issue per patch, please.
Thanks,
Frans
On Wed, Jul 01, 2015 at 02:07:05PM +0200, Frans Klaver wrote:
> On Wed, Jul 1, 2015 at 1:56 PM, Sohny Thomas <[email protected]> wrote:
> > - removed non-existant issue from TODO file
>
> s,existant,existent,
>
> > kuid_t or uid_t not present in staging/android
> > - fixed 80 char limit exceeding line
> > - a newline after decelartions as per checkpatch.pl
> > - fixed an unnecessary typedef as reported by checkpatch.pl
>
> Fix one issue per patch, please.
And Signed-off-by is missing.
regards
sudip
On Wednesday 01 July 2015 05:37 PM, Frans Klaver wrote:
> On Wed, Jul 1, 2015 at 1:56 PM, Sohny Thomas <[email protected]> wrote:
>> - removed non-existant issue from TODO file
>
> s,existant,existent,
Thanks missed that
>
>> kuid_t or uid_t not present in staging/android
>> - fixed 80 char limit exceeding line
>> - a newline after decelartions as per checkpatch.pl
>> - fixed an unnecessary typedef as reported by checkpatch.pl
>
> Fix one issue per patch, please.
Since these were all simple Fixes of about 1/2 lines , I thought to make a single patch.
>
> Thanks,
> Frans
>
On Wed, Jul 1, 2015 at 2:22 PM, Sohny Thomas <[email protected]> wrote:
>
>
> On Wednesday 01 July 2015 05:37 PM, Frans Klaver wrote:
>> On Wed, Jul 1, 2015 at 1:56 PM, Sohny Thomas <[email protected]> wrote:
>>> - removed non-existant issue from TODO file
>>
>> s,existant,existent,
> Thanks missed that
>>
>>> kuid_t or uid_t not present in staging/android
>>> - fixed 80 char limit exceeding line
>>> - a newline after decelartions as per checkpatch.pl
>>> - fixed an unnecessary typedef as reported by checkpatch.pl
>>
>> Fix one issue per patch, please.
> Since these were all simple Fixes of about 1/2 lines , I thought to make a single patch.
They are simple fixes, but a reviewer still has to figure out what
comment belongs to which code change. Since there's no reason for
these changes to be atomic, you might as well split them up to make
reviewing easier.
Frans
On Wednesday 01 July 2015 05:59 PM, Frans Klaver wrote:
> On Wed, Jul 1, 2015 at 2:22 PM, Sohny Thomas <[email protected]> wrote:
>>
>>
>> On Wednesday 01 July 2015 05:37 PM, Frans Klaver wrote:
>>> On Wed, Jul 1, 2015 at 1:56 PM, Sohny Thomas <[email protected]> wrote:
>>>> - removed non-existant issue from TODO file
>>>
>>> s,existant,existent,
>> Thanks missed that
>>>
>>>> kuid_t or uid_t not present in staging/android
>>>> - fixed 80 char limit exceeding line
>>>> - a newline after decelartions as per checkpatch.pl
>>>> - fixed an unnecessary typedef as reported by checkpatch.pl
>>>
>>> Fix one issue per patch, please.
>> Since these were all simple Fixes of about 1/2 lines , I thought to make a single patch.
>
> They are simple fixes, but a reviewer still has to figure out what
> comment belongs to which code change. Since there's no reason for
> these changes to be atomic, you might as well split them up to make
> reviewing easier.
>
Yeap, V2 coming with changes and fixes Sudip's catch too.
Thanks for your time.
-Sohny
> Frans
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>