[Ocfs2-test-devel] [PATCH] inline-data: remove duplicated definition

[Coly Li]

tristan.ye Wrote:
> On Mon, 2009-03-23 at 09:20 +0800, tristan.ye wrote:
>> Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
>>
>> On Sat, 2009-03-21 at 01:28 +0800, Coly Li wrote:
>>> This patch removes a compiling error from programs/inline-data:
>>> multi-inline-dirs.c:72: error: redefinition of 'union semun'
> 
> It should be removed anyway since multi-nodes tests did not use semphore
> for communication anymore, that's good catch.
> 
> But I'm wondering how did you hit this compiling error, you were not
> supposed to encounter such a error actually, since the multi-inline-dirs
> and inline-dirs were compiled separately(refer to makefile), how did you
> get a var redefinition error???
> 
I just typed 'make' :))

It seems because I did not clean current working directory by 'make clean' after
pulled latest code from repository.

I just cleaned current working directory, and 'make' again. This time I get a
complain requiring openmpi-devel. After installed openmpi-devel, and 'make'
again, I don't see this compiling error any more.

BTW, I can not check in patch to repository so far. Could you please to help me
check in the patches ? Thanks.

> How did you compile and build the ocfs2-test.
> 
> Actually, the error you hit in splice_test did not happen to us at all.
> 
>>> Signed-off-by: Coly Li <coly.li at suse.de>
>>> ---
>>>  programs/inline-data/multi-inline-dirs.c |    7 -------
>>>  1 files changed, 0 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/programs/inline-data/multi-inline-dirs.c
>>> b/programs/inline-data/multi-inline-dirs.c
>>> index 67bfc7a..047b14f 100644
>>> --- a/programs/inline-data/multi-inline-dirs.c
>>> +++ b/programs/inline-data/multi-inline-dirs.c
>>> @@ -69,13 +69,6 @@ struct my_dirent {
>>>  	char		name[OCFS2_MAX_FILENAME_LEN];
>>>  };
>>>
>>> -union semun {
>>> -	int val;                    /* value for SETVAL */
>>> -	struct semid_ds *buf;       /* buffer for IPC_STAT, IPC_SET */
>>> -	unsigned short int *array;  /* array for GETALL, SETALL */
>>> -	struct seminfo *__buf;      /* buffer for IPC_INFO */
>>> -};
>>> -
>>>  static char *prog;
>>>  static char device[100];
> 

-- 
Coly Li
SuSE Labs