Patchwork [08/17] linux-user: fix fallocate

login
register
mail settings
Submitter riku.voipio@linaro.org
Date April 6, 2012, 4:35 p.m.
Message ID <20249ae189ac0baa5011770bccabf3ee802eb2ab.1333729958.git.riku.voipio@linaro.org>
Download mbox | patch
Permalink /patch/151262/
State New
Headers show

Comments

riku.voipio@linaro.org - April 6, 2012, 4:35 p.m.
From: Alexander Graf <agraf@suse.de>

Fallocate gets off_t parameters passed in, so we should also read them out
accordingly.

Signed-off-by: Alexander Graf <agraf@suse.de>

---

v1 -> v2:

  - unbreak 64-bit guests

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/syscall.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
Alexander Graf - April 16, 2012, 5:33 p.m.
On 06.04.2012, at 18:35, riku.voipio@linaro.org wrote:

> From: Alexander Graf <agraf@suse.de>
> 
> Fallocate gets off_t parameters passed in, so we should also read them out
> accordingly.
> 
> Signed-off-by: Alexander Graf <agraf@suse.de>
> 
> ---
> 
> v1 -> v2:
> 
>  - unbreak 64-bit guests
> 
> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>

Just looking at the patch, maybe you want to use "git am -s" to add your signed-off-by line :). That way it doesn't go below the --- which indicates "everything below should be removed by git am". Or just throw away the history when you apply it :).


Alex

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9d1c8b2..fdd49b1 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8485,7 +8485,12 @@  abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 #endif /* CONFIG_EVENTFD  */
 #if defined(CONFIG_FALLOCATE) && defined(TARGET_NR_fallocate)
     case TARGET_NR_fallocate:
+#if TARGET_ABI_BITS == 32
+        ret = get_errno(fallocate(arg1, arg2, target_offset64(arg3, arg4),
+                                  target_offset64(arg5, arg6)));
+#else
         ret = get_errno(fallocate(arg1, arg2, arg3, arg4));
+#endif
         break;
 #endif
 #if defined(CONFIG_SYNC_FILE_RANGE)