Update call sites of SAFE_WRITE() to use the enum values
PATCH 1/1 Update call sites of SAFE_WRITE() to use the enum values
From: Victor Cheng-Yen Yang <[email protected]>
SAFE_WRITE_ANY (0) and SAFE_WRITE_ALL (1) exist so that the len_strict parameter is not a nameless boolean. Replace the remaining magic numbers in the tests so that the intent of every call site is visible without looking up the prototype.
The conversion is mechanical: 0 becomes SAFE_WRITE_ANY and 1 becomes SAFE_WRITE_ALL. No functional change.
Signed-off-by Victor Cheng-Yen Yang <[email protected]>
--- testcases/cve/refluxfs.c | 2 +- testcases/kernel/fs/fsplough/fsplough.c | 2 +- testcases/kernel/io/ltp-aiodio/aiocp.c | 2 +- testcases/kernel/mem/hugetlb/hugemmap/hugemmap11.c | 2 +- testcases/kernel/mem/mmapstress/mmapstress01.c | 2 +- testcases/kernel/syscalls/cachestat/cachestat01.c | 2 +- testcases/kernel/syscalls/cachestat/cachestat02.c | 2 +- testcases/kernel/syscalls/epoll_wait/epoll_wait07.c | 4 ++-- testcases/kernel/syscalls/eventfd/eventfd02.c | 4 ++-- testcases/kernel/syscalls/eventfd/eventfd03.c | 2 +- testcases/kernel/syscalls/eventfd/eventfd04.c | 4 ++-- testcases/kernel/syscalls/eventfd/eventfd05.c | 2 +- testcases/kernel/syscalls/eventfd/eventfd06.c | 2 +- testcases/kernel/syscalls/eventfd2/eventfd2_03.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify25.c | 2 +- testcases/kernel/syscalls/ioctl/ioctl_ficlone01.c | 2 +- testcases/kernel/syscalls/madvise/madvise11.c | 4 ++-- testcases/kernel/syscalls/mount/mount03.c | 2 +- testcases/kernel/syscalls/open/open12.c | 4 ++-- testcases/kernel/syscalls/open/open14.c | 2 +- testcases/kernel/syscalls/pipe/pipe15.c | 4 ++-- testcases/kernel/syscalls/splice/splice09.c | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-)
testcases/cve/refluxfs.c +1 -1
@@ -109,7 +109,7 @@ static void setup(void)SAFE_CHMOD (WORKDIR ,0777 ); target_fd =SAFE_OPEN (TARGET ,O_RDWR |O_CREAT |O_TRUNC ,0644 ); -SAFE_WRITE (1 , target_fd, tbuf, blksize); +SAFE_WRITE (SAFE_WRITE_ALL , target_fd, tbuf, blksize);SAFE_FSYNC (target_fd);SAFE_CLOSE (target_fd);
testcases/kernel/fs/fsplough/fsplough.c +1 -1
@@ -94,7 +94,7 @@ static void update_filedata(const void *buf, size_t offset, size_t size)static void do_write (void *buf,size_t offset,size_t size) {SAFE_LSEEK (write_fd, offset,SEEK_SET ); -SAFE_WRITE (1 , write_fd, buf, size); +SAFE_WRITE (SAFE_WRITE_ALL , write_fd, buf, size); }static void do_pwrite (void *buf,size_t offset,size_t size)
testcases/kernel/io/ltp-aiodio/aiocp.c +1 -1
@@ -58,7 +58,7 @@ static void fill_with_rand_data(int fd, long long size)long long i = size;while (i >0 ) { -SAFE_WRITE (1 , fd, tst_rand_data, +SAFE_WRITE (SAFE_WRITE_ALL , fd, tst_rand_data,MIN ((long long )tst_rand_data_len, i)); i -= tst_rand_data_len; }
testcases/kernel/mem/hugetlb/hugemmap/hugemmap11.c +1 -1
@@ -37,7 +37,7 @@ static void run_test(void) p =SAFE_MMAP (NULL , hpage_size,PROT_READ |PROT_WRITE ,MAP_PRIVATE , fd,0 );memcpy (p,P0 ,8 ); -SAFE_WRITE (1 , nfd, p,IOSZ ); +SAFE_WRITE (SAFE_WRITE_ALL , nfd, p,IOSZ );SAFE_LSEEK (nfd,0 ,SEEK_SET );SAFE_READ (SAFE_READ_ALL , nfd, buf,IOSZ );
testcases/kernel/mem/mmapstress/mmapstress01.c +1 -1
@@ -291,7 +291,7 @@ static void run(void)SAFE_LSEEK (fd, (off_t )sparseoffset,SEEK_SET );for (bytes_left = filesize; bytes_left; bytes_left -= c) { write_cnt =MIN ((long long )pagesize, (long long )bytes_left); - c =SAFE_WRITE (1 , fd, buf, write_cnt); + c =SAFE_WRITE (SAFE_WRITE_ALL , fd, buf, write_cnt); }SAFE_CLOSE (fd);
testcases/kernel/syscalls/cachestat/cachestat01.c +1 -1
@@ -39,7 +39,7 @@ static void test_cached_pages(const unsigned int use_sync, const int num_pages) fd =SAFE_OPEN (FILENAME ,O_RDWR |O_CREAT ,0600 );for (int i =0 ; i < num_pages; i++) -SAFE_WRITE (0 , fd, page_data, page_size); +SAFE_WRITE (SAFE_WRITE_ANY , fd, page_data, page_size);if (use_sync)SAFE_FSYNC (fd);
testcases/kernel/syscalls/cachestat/cachestat02.c +1 -1
@@ -43,7 +43,7 @@ static void test_cached_pages(const int num_pages)SAFE_FTRUNCATE (fd, file_size);for (int i =0 ; i < num_pages; i++) -SAFE_WRITE (0 , fd, page_data, page_size); +SAFE_WRITE (SAFE_WRITE_ANY , fd, page_data, page_size);memset (cs,0xff ,sizeof (*cs));
testcases/kernel/syscalls/epoll_wait/epoll_wait07.c +2 -2
@@ -47,7 +47,7 @@ static void run(void)tst_res (TINFO ,"Write channel for the 1st time. EPOLLIN expected" ); -SAFE_WRITE (0 , fds[1 ], &buff,1 ); +SAFE_WRITE (SAFE_WRITE_ANY , fds[1 ], &buff,1 );TST_EXP_EQ_LI (SAFE_EPOLL_WAIT (epfd, &evt_receive,10 ,0 ),1 );TST_EXP_EQ_LI (evt_receive.events &EPOLLIN ,EPOLLIN );TST_EXP_EQ_LI (evt_receive.data.fd, fds[0 ]);
@@ -57,7 +57,7 @@ static void run(void)tst_res (TINFO ,"Write channel for the 2nd time. No events expected" ); -SAFE_WRITE (0 , fds[1 ], &buff,1 ); +SAFE_WRITE (SAFE_WRITE_ANY , fds[1 ], &buff,1 );TST_EXP_EQ_LI (SAFE_EPOLL_WAIT (epfd, &evt_receive,10 ,0 ),0 );SAFE_CLOSE (epfd);
testcases/kernel/syscalls/eventfd/eventfd02.c +2 -2
@@ -27,12 +27,12 @@ static void run(void) fd =TST_EXP_FD (eventfd (0 ,EFD_NONBLOCK )); -SAFE_WRITE (0 , fd, &val,sizeof (val)); +SAFE_WRITE (SAFE_WRITE_ANY , fd, &val,sizeof (val));SAFE_READ (SAFE_READ_ANY , fd, &buf,sizeof (buf));TST_EXP_EQ_LI (buf, val); val =UINT64_MAX -1 ; -SAFE_WRITE (0 , fd, &val,sizeof (val)); +SAFE_WRITE (SAFE_WRITE_ANY , fd, &val,sizeof (val));TST_EXP_FAIL (write (fd, &val,sizeof (val)),EAGAIN );TST_EXP_FAIL (write (fd, &invalid,sizeof (invalid)),EINVAL );
testcases/kernel/syscalls/eventfd/eventfd03.c +1 -1
@@ -29,7 +29,7 @@ static void run(void)FD_ZERO (&readfds);FD_SET (fd, &readfds); -SAFE_WRITE (0 , fd, &non_zero,sizeof (non_zero)); +SAFE_WRITE (SAFE_WRITE_ANY , fd, &non_zero,sizeof (non_zero));TEST (select (fd +1 , &readfds,NULL ,NULL , &timeout));if (TST_RET ==-1 )tst_brk (TBROK |TERRNO ,"select" );
testcases/kernel/syscalls/eventfd/eventfd04.c +2 -2
@@ -30,7 +30,7 @@ static void run(void)FD_ZERO (&writefds);FD_SET (fd, &writefds); -SAFE_WRITE (0 , fd, &non_max,sizeof (non_max)); +SAFE_WRITE (SAFE_WRITE_ANY , fd, &non_max,sizeof (non_max));TEST (select (fd +1 ,NULL , &writefds,NULL , &timeout));if (TST_RET ==-1 )tst_brk (TBROK |TERRNO ,"select" );
@@ -38,7 +38,7 @@ static void run(void)TST_EXP_EQ_LI (FD_ISSET (fd, &writefds),1 );SAFE_READ (SAFE_READ_ANY , fd, &val,sizeof (val)); -SAFE_WRITE (0 , fd, &max,sizeof (max)); +SAFE_WRITE (SAFE_WRITE_ANY , fd, &max,sizeof (max));TEST (select (fd +1 ,NULL , &writefds,NULL , &timeout));if (TST_RET ==-1 )
testcases/kernel/syscalls/eventfd/eventfd05.c +1 -1
@@ -23,7 +23,7 @@ static void run(void) fd =TST_EXP_FD (eventfd (0 ,EFD_NONBLOCK ));if (!SAFE_FORK ()) { -SAFE_WRITE (0 , fd, &to_parent,sizeof (to_parent)); +SAFE_WRITE (SAFE_WRITE_ANY , fd, &to_parent,sizeof (to_parent));exit (0 ); }
testcases/kernel/syscalls/eventfd/eventfd06.c +1 -1
@@ -80,7 +80,7 @@ static void clear_counter(void)if (TST_RET ==-1 &&TST_ERR !=EAGAIN )tst_brk (TBROK |TERRNO ,"read" ); -SAFE_WRITE (0 , evfd, &max,sizeof (max)); +SAFE_WRITE (SAFE_WRITE_ANY , evfd, &max,sizeof (max)); }static void test_select (void )
testcases/kernel/syscalls/eventfd2/eventfd2_03.c +1 -1
@@ -26,7 +26,7 @@ static void xsem_post(int fd, int count) {u_int64_t cntr = count; -SAFE_WRITE (0 , fd, &cntr,sizeof (cntr)); +SAFE_WRITE (SAFE_WRITE_ANY , fd, &cntr,sizeof (cntr)); }static void sem_player (int fd1,int fd2)
testcases/kernel/syscalls/fanotify/fanotify25.c +1 -1
@@ -62,7 +62,7 @@ static void do_child(void)for (i =0 , events =0 ; trace_cmds[i].filename; i++) { fd =SAFE_OPEN (trace_cmds[i].filename,O_WRONLY ,0644 ); -SAFE_WRITE (1 , fd, trace_cmds[i].wdata, +SAFE_WRITE (SAFE_WRITE_ALL , fd, trace_cmds[i].wdata,strlen (trace_cmds[i].wdata));SAFE_CLOSE (fd);
testcases/kernel/syscalls/ioctl/ioctl_ficlone01.c +1 -1
@@ -40,7 +40,7 @@ static void run(void)tst_res (TINFO ,"Writing data inside src file" ); -SAFE_WRITE (1 , src_fd,FILEDATA ,FILESIZE ); +SAFE_WRITE (SAFE_WRITE_ALL , src_fd,FILEDATA ,FILESIZE );SAFE_FSYNC (src_fd);TST_EXP_PASS (ioctl (dst_fd,FICLONE , src_fd));
testcases/kernel/syscalls/madvise/madvise11.c +2 -2
@@ -287,7 +287,7 @@ static void unpoison_this_pfn(unsigned long pfn, int fd)char pfn_str[19 ];snprintf (pfn_str,sizeof (pfn_str),"0x%lx" , pfn); -SAFE_WRITE (0 , fd, pfn_str,strlen (pfn_str)); +SAFE_WRITE (SAFE_WRITE_ANY , fd, pfn_str,strlen (pfn_str)); }/* Find and open the <debugfs>/hwpoison/unpoison-pfn special file */
@@ -382,7 +382,7 @@ static void write_beginning_tag_to_kmsg(void)snprintf (beginning_tag,sizeof (beginning_tag),"Soft-offlining pages test starting (pid: %ld)" , (long )getpid ()); -SAFE_WRITE (1 , fd, beginning_tag,strlen (beginning_tag)); +SAFE_WRITE (SAFE_WRITE_ALL , fd, beginning_tag,strlen (beginning_tag));SAFE_CLOSE (fd); }
testcases/kernel/syscalls/mount/mount03.c +1 -1
@@ -110,7 +110,7 @@ static void test_file_dir_noatime(int update_fatime, int update_datime)if (access (dir,F_OK ) ==-1 && errno ==ENOENT )SAFE_MKDIR (dir,0700 ); -SAFE_WRITE (1 , otfd,TEST_STR ,strlen (TEST_STR )); +SAFE_WRITE (SAFE_WRITE_ALL , otfd,TEST_STR ,strlen (TEST_STR ));SAFE_FSTAT (otfd, &st); atime = st.st_atime;
testcases/kernel/syscalls/open/open12.c +2 -2
@@ -61,7 +61,7 @@ static void test_append(void)SAFE_FSTAT (fd, &statbuf); len1 =strlen (TEST_FILE ); -SAFE_WRITE (1 , fd,TEST_FILE , len1); +SAFE_WRITE (SAFE_WRITE_ALL , fd,TEST_FILE , len1); len2 =SAFE_LSEEK (fd,0 ,SEEK_CUR );SAFE_CLOSE (fd); len1 += statbuf.st_size;
@@ -161,7 +161,7 @@ static void test_largefile(void)return ; } -SAFE_WRITE (1 , fd,LARGE_FILE ,strlen (LARGE_FILE )); +SAFE_WRITE (SAFE_WRITE_ALL , fd,LARGE_FILE ,strlen (LARGE_FILE ));SAFE_CLOSE (fd); fd =open (LARGE_FILE ,O_LARGEFILE |O_RDONLY ,0644 );
testcases/kernel/syscalls/open/open14.c +1 -1
@@ -51,7 +51,7 @@ static void write_file(int fd)int i;for (i =0 ; i < blocks_num; ++i) -SAFE_WRITE (1 , fd, buf, size); +SAFE_WRITE (SAFE_WRITE_ALL , fd, buf, size); }static void test01 (void )
testcases/kernel/syscalls/pipe/pipe15.c +2 -2
@@ -30,9 +30,9 @@ static void run(void)const int buffer_size =SAFE_FCNTL (pipe[1 ],F_GETPIPE_SZ );tst_res (TINFO ,"Soft-limited buffer size: %d bytes" , buffer_size); -SAFE_WRITE (1 , pipe[1 ], buffer, buffer_size); +SAFE_WRITE (SAFE_WRITE_ALL , pipe[1 ], buffer, buffer_size);SAFE_READ (SAFE_READ_ALL , pipe[0 ], buffer, buffer_size -1 ); -SAFE_WRITE (1 , pipe[1 ], buffer,1 ); +SAFE_WRITE (SAFE_WRITE_ALL , pipe[1 ], buffer,1 );tst_res (TPASS ,"Pipe operation did not block" );SAFE_READ (SAFE_READ_ALL , pipe[0 ], buffer,2 );
testcases/kernel/syscalls/splice/splice09.c +1 -1
@@ -32,7 +32,7 @@ static void verify_splice(unsigned int n) dev_fd =SAFE_OPEN (test_devices[n],O_WRONLY );SAFE_PIPE (pipefd); -SAFE_WRITE (1 , pipefd[1 ], buf,sizeof (buf)); +SAFE_WRITE (SAFE_WRITE_ALL , pipefd[1 ], buf,sizeof (buf));TST_EXP_POSITIVE (splice (pipefd[0 ],NULL , dev_fd,NULL ,sizeof (buf),0 ));
Signature · 5 lines
2.55.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Victor,
can you send a new version? This patch doesn't apply:
https://github.com/linux-test-project/ltp/actions/runs/37746844459
Regards,
--
Andrea Cervesato
SUSE QE Automation Engineer Linux
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp