* [PATCH] Fix fallocate erroneously returning ENOSYS on Linux systems
@ 2012-07-31 19:49 clinew
2012-07-31 20:22 ` Jens Axboe
0 siblings, 1 reply; 4+ messages in thread
From: clinew @ 2012-07-31 19:49 UTC (permalink / raw)
To: fio, kcastiglia
Currently, the helpers.c file provides a function defintion for Linux
fallocate
that sets errno to ENOSYS and returns failure; this is useful for a non-Linux
OS. However, this definition will override the Linux implementation of
fallocate when 'fallocate=keep' is set. Adding a preprocessor macro to check
if Linux fallocate is defined fixes this issue.
Signed-off-by: Wade Cline <wcline@us.ibm.com>
---
helpers.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/helpers.c b/helpers.c
index 9562567..714842e 100644
--- a/helpers.c
+++ b/helpers.c
@@ -9,11 +9,13 @@
#include "arch/arch.h"
#include "os/os.h"
+#ifndef FIO_HAVE_LINUX_FALLOCATE
int _weak fallocate(int fd, int mode, off_t offset, off_t len)
{
errno = ENOSYS;
return -1;
}
+#endif
#ifndef __NR_fallocate
int _weak posix_fallocate(int fd, off_t offset, off_t len)
--
1.7.8.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix fallocate erroneously returning ENOSYS on Linux systems
2012-07-31 19:49 clinew
@ 2012-07-31 20:22 ` Jens Axboe
0 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2012-07-31 20:22 UTC (permalink / raw)
To: clinew; +Cc: fio, kcastiglia
On 07/31/2012 09:49 PM, clinew@onid.orst.edu wrote:
> Currently, the helpers.c file provides a function defintion for Linux fallocate
> that sets errno to ENOSYS and returns failure; this is useful for a non-Linux
> OS. However, this definition will override the Linux implementation of
> fallocate when 'fallocate=keep' is set. Adding a preprocessor macro to check
> if Linux fallocate is defined fixes this issue.
>
> Signed-off-by: Wade Cline <wcline@us.ibm.com>
> ---
> helpers.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/helpers.c b/helpers.c
> index 9562567..714842e 100644
> --- a/helpers.c
> +++ b/helpers.c
> @@ -9,11 +9,13 @@
> #include "arch/arch.h"
> #include "os/os.h"
>
> +#ifndef FIO_HAVE_LINUX_FALLOCATE
> int _weak fallocate(int fd, int mode, off_t offset, off_t len)
> {
> errno = ENOSYS;
> return -1;
> }
> +#endif
Hmm, the purpose of the _weak would be to NOT override a fallocate() if
we have one. Why isn't this working?
--
Jens Axboe
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix fallocate erroneously returning ENOSYS on Linux systems
@ 2012-07-31 20:57 clinew
2012-08-01 6:45 ` Jens Axboe
0 siblings, 1 reply; 4+ messages in thread
From: clinew @ 2012-07-31 20:57 UTC (permalink / raw)
To: axboe; +Cc: fio, kcastiglia, cmm
> On 07/31/2012 09:49 PM, clinew@onid.orst.edu wrote:
>> Currently, the helpers.c file provides a function defintion for
>> Linux fallocate
>> that sets errno to ENOSYS and returns failure; this is useful for a
>> non-Linux
>> OS. However, this definition will override the Linux implementation of
>> fallocate when 'fallocate=keep' is set. Adding a preprocessor macro to check
>> if Linux fallocate is defined fixes this issue.
>>
>> Signed-off-by: Wade Cline <wcline@us.ibm.com>
>> ---
>> helpers.c | 2 ++
>> 1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/helpers.c b/helpers.c
>> index 9562567..714842e 100644
>> --- a/helpers.c
>> +++ b/helpers.c
>> @@ -9,11 +9,13 @@
>> #include "arch/arch.h"
>> #include "os/os.h"
>>
>> +#ifndef FIO_HAVE_LINUX_FALLOCATE
>> int _weak fallocate(int fd, int mode, off_t offset, off_t len)
>> {
>> errno = ENOSYS;
>> return -1;
>> }
>> +#endif
>
> Hmm, the purpose of the _weak would be to NOT override a fallocate() if
> we have one. Why isn't this working?
>
> --
> Jens Axboe
>
> --
> To unsubscribe from this list: send the line "unsubscribe fio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
I am not sure. Running 'nm' with and without the patch provides the
following symbol table information:
Without patch:
W fallocate64
w posix_fallocate64@@GLIBC_2.2.5
With patch:
w fallocate64@@GLIBC_2.10
w posix_fallocate64@@GLIBC_2.2.5
My interpretation of this is that, without the patch, the
weakly-linked symbol has a default definition and doesn't know to look
up the correct shared-library routine, so it falls back to the default
definition; this may or may not be the case. Also, it appears that
using #ifndef <funciton definition> #endif has been done for a number
of functions in 'helpers.c', so this may not be the only function that
has experienced the same issue.
-Wade Cline
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix fallocate erroneously returning ENOSYS on Linux systems
2012-07-31 20:57 [PATCH] Fix fallocate erroneously returning ENOSYS on Linux systems clinew
@ 2012-08-01 6:45 ` Jens Axboe
0 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2012-08-01 6:45 UTC (permalink / raw)
To: clinew; +Cc: fio, kcastiglia, cmm
On 07/31/2012 10:57 PM, clinew@onid.orst.edu wrote:
>> On 07/31/2012 09:49 PM, clinew@onid.orst.edu wrote:
>>> Currently, the helpers.c file provides a function defintion for Linux fallocate
>>> that sets errno to ENOSYS and returns failure; this is useful for a non-Linux
>>> OS. However, this definition will override the Linux implementation of
>>> fallocate when 'fallocate=keep' is set. Adding a preprocessor macro to check
>>> if Linux fallocate is defined fixes this issue.
>>>
>>> Signed-off-by: Wade Cline <wcline@us.ibm.com>
>>> ---
>>> helpers.c | 2 ++
>>> 1 files changed, 2 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/helpers.c b/helpers.c
>>> index 9562567..714842e 100644
>>> --- a/helpers.c
>>> +++ b/helpers.c
>>> @@ -9,11 +9,13 @@
>>> #include "arch/arch.h"
>>> #include "os/os.h"
>>>
>>> +#ifndef FIO_HAVE_LINUX_FALLOCATE
>>> int _weak fallocate(int fd, int mode, off_t offset, off_t len)
>>> {
>>> errno = ENOSYS;
>>> return -1;
>>> }
>>> +#endif
>>
>> Hmm, the purpose of the _weak would be to NOT override a fallocate() if
>> we have one. Why isn't this working?
>>
>> --
>> Jens Axboe
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe fio" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>
> I am not sure. Running 'nm' with and without the patch provides the following symbol table information:
>
> Without patch:
> W fallocate64
> w posix_fallocate64@@GLIBC_2.2.5
>
> With patch:
> w fallocate64@@GLIBC_2.10
> w posix_fallocate64@@GLIBC_2.2.5
>
> My interpretation of this is that, without the patch, the
> weakly-linked symbol has a default definition and doesn't know to look
> up the correct shared-library routine, so it falls back to the default
> definition; this may or may not be the case. Also, it appears that
> using #ifndef <funciton definition> #endif has been done for a number
> of functions in 'helpers.c', so this may not be the only function that
> has experienced the same issue.
I think you are right. It's all pretty much dancing around the fact that
fio does not use autoconf or similar to detect these at build time. I'll
apply the patch, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-01 6:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-31 20:57 [PATCH] Fix fallocate erroneously returning ENOSYS on Linux systems clinew
2012-08-01 6:45 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2012-07-31 19:49 clinew
2012-07-31 20:22 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.