[PATCH][COMPAT] move struct flock32 4/8 x86_64

Stephen Rothwell (sfr@canb.auug.org.au)
Fri, 3 Jan 2003 17:25:33 +1100


Hi Andi,

Here is the x86_64 specific patch. This is against Linus' recent 2.5.54
BK tree plus the previous patch I sent you.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff -ruN 2.5.54-200301031304-32bit.1/arch/x86_64/ia32/sys_ia32.c 2.5.54-200301031304-32bit.2/arch/x86_64/ia32/sys_ia32.c --- 2.5.54-200301031304-32bit.1/arch/x86_64/ia32/sys_ia32.c 2003-01-02 15:13:46.000000000 +1100 +++ 2.5.54-200301031304-32bit.2/arch/x86_64/ia32/sys_ia32.c 2003-01-03 16:24:56.000000000 +1100 @@ -1066,30 +1066,6 @@ return ret; } -static inline int get_flock(struct flock *kfl, struct flock32 *ufl) -{ - int err; - - err = get_user(kfl->l_type, &ufl->l_type); - err |= __get_user(kfl->l_whence, &ufl->l_whence); - err |= __get_user(kfl->l_start, &ufl->l_start); - err |= __get_user(kfl->l_len, &ufl->l_len); - err |= __get_user(kfl->l_pid, &ufl->l_pid); - return err; -} - -static inline int put_flock(struct flock *kfl, struct flock32 *ufl) -{ - int err; - - err = __put_user(kfl->l_type, &ufl->l_type); - err |= __put_user(kfl->l_whence, &ufl->l_whence); - err |= __put_user(kfl->l_start, &ufl->l_start); - err |= __put_user(kfl->l_len, &ufl->l_len); - err |= __put_user(kfl->l_pid, &ufl->l_pid); - return err; -} - extern asmlinkage long sys_fcntl(unsigned int fd, unsigned int cmd, unsigned long arg); asmlinkage long sys32_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg); @@ -1105,13 +1081,13 @@ mm_segment_t old_fs; long ret; - if (get_flock(&f, (struct flock32 *)arg)) + if (get_compat_flock(&f, (struct compat_flock *)arg)) return -EFAULT; old_fs = get_fs(); set_fs (KERNEL_DS); ret = sys_fcntl(fd, cmd, (unsigned long)&f); set_fs (old_fs); if (ret) return ret; - if (put_flock(&f, (struct flock32 *)arg)) + if (put_compat_flock(&f, (struct compat_flock *)arg)) return -EFAULT; return 0; } diff -ruN 2.5.54-200301031304-32bit.1/include/asm-x86_64/compat.h 2.5.54-200301031304-32bit.2/include/asm-x86_64/compat.h --- 2.5.54-200301031304-32bit.1/include/asm-x86_64/compat.h 2003-01-03 16:24:15.000000000 +1100 +++ 2.5.54-200301031304-32bit.2/include/asm-x86_64/compat.h 2003-01-03 16:24:56.000000000 +1100 @@ -60,4 +60,12 @@ u32 __unused5; }; +struct compat_flock { + short l_type; + short l_whence; + compat_off_t l_start; + compat_off_t l_len; + compat_pid_t l_pid; +}; + #endif /* _ASM_X86_64_COMPAT_H */ diff -ruN 2.5.54-200301031304-32bit.1/include/asm-x86_64/ia32.h 2.5.54-200301031304-32bit.2/include/asm-x86_64/ia32.h --- 2.5.54-200301031304-32bit.1/include/asm-x86_64/ia32.h 2003-01-03 16:24:15.000000000 +1100 +++ 2.5.54-200301031304-32bit.2/include/asm-x86_64/ia32.h 2003-01-03 16:24:56.000000000 +1100 @@ -11,16 +11,6 @@ * 32 bit structures for IA32 support. */ -/* fcntl.h */ -struct flock32 { - short l_type; - short l_whence; - compat_off_t l_start; - compat_off_t l_len; - compat_pid_t l_pid; -}; - - struct ia32_flock64 { short l_type; short l_whence; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/