From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guangwen Feng Date: Thu, 30 Mar 2017 17:49:37 +0800 Subject: [LTP] [PATCH] syscalls/memfd_create: Fix build fail when HAVE_FALLOCATE not defined In-Reply-To: <20170330093540.GB12095@rei.lan> References: <20170329091839.GD7089@rei.lan> <1490779921-7162-1-git-send-email-fenggw-fnst@cn.fujitsu.com> <20170330093540.GB12095@rei.lan> Message-ID: <58DCD4B1.5060705@cn.fujitsu.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ltp@lists.linux.it Hi! On 03/30/2017 05:35 PM, Cyril Hrubis wrote: > Hi! >> /* Deal with 32bit ABIs that have 64bit syscalls. */ >> # if LTP_USE_64_ABI >> +#ifdef __TEST_H__ >> return ltp_syscall(__NR_fallocate, fd, mode, offset, len); >> +#else >> + return tst_syscall(__NR_fallocate, fd, mode, offset, len); >> +#endif /* __TEST_H__ */ >> # else >> +#ifdef __TEST_H__ >> return (long)ltp_syscall(__NR_fallocate, fd, mode, >> __LONG_LONG_PAIR((off_t) (offset >> 32), >> (off_t) offset), >> __LONG_LONG_PAIR((off_t) (len >> 32), >> (off_t) len)); >> +#else >> + return (long)tst_syscall(__NR_fallocate, fd, mode, >> + __LONG_LONG_PAIR((off_t) (offset >> 32), >> + (off_t) offset), >> + __LONG_LONG_PAIR((off_t) (len >> 32), >> + (off_t) len)); >> +#endif /* __TEST_H__ */ > > We can spare a bit of the duplication by definign the function name: > > ... > > #ifdef __TEST_H__ > # define TST_SYSCALL_WRAPPER ltp_syscall > #else > # define TST_SYSCALL_WRAPPER tst_syscall > #endif > > ... > return (long)TST_SYSCALL_WRAPPER(__NR_fallocate, fd, mode, > __LONG_LONG_PAIR((off_t) (offset >> 32), > (off_t) offset), > __LONG_LONG_PAIR((off_t) (len >> 32), > (off_t) len)); > Oh, right, thanks a lot... I will send a V2 soon. Best Regards, Guangwen Feng