Add __do_ftruncate that truncates a struct file*
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/2 Add __do_ftruncate that truncates a struct file*
do_sys_ftruncate receives a file descriptor, fgets the struct file*, and finally actually truncates the file.
__do_ftruncate allows for truncating a file without fgets.
--- fs/open.c | 52 ++++++++++++++++++++++++---------------- include/linux/syscalls.h | 2 ++ 2 files changed, 33 insertions(+), 21 deletions(-)
fs/open.c +31 -21
@@ -154,47 +154,57 @@ COMPAT_SYSCALL_DEFINE2(truncate, const char __user *, path, compat_off_t, length }#endif -long do_sys_ftruncate (unsigned int fd,loff_t length,int small) +long __do_ftruncate (struct file *file,loff_t length,int small) {struct inode *inode;struct dentry *dentry; -struct fd f;int error; - error = -EINVAL ; -if (length <0 ) - goto out; - error = -EBADF ; - f =fdget (fd); -if (!f.file) - goto out; -/* explicitly opened as large or we are on 64-bit box */ -if (f.file->f_flags &O_LARGEFILE ) +if (file->f_flags &O_LARGEFILE ) small =0 ; - dentry = f.file->f_path.dentry; + dentry = file->f_path.dentry; inode = dentry->d_inode; error = -EINVAL ; -if (!S_ISREG (inode->i_mode) || !(f.file->f_mode &FMODE_WRITE )) - goto out_putf; +if (!S_ISREG (inode->i_mode) || !(file->f_mode &FMODE_WRITE )) + goto out; error = -EINVAL ;/* Cannot ftruncate over 2^31 bytes without large file support */ if (small && length >MAX_NON_LFS ) - goto out_putf; + goto out; error = -EPERM ;/* Check IS_APPEND on real upper inode */ -if (IS_APPEND (file_inode (f.file))) - goto out_putf; +if (IS_APPEND (file_inode (file))) + goto out;sb_start_write (inode->i_sb); - error =security_file_truncate (f.file); + error =security_file_truncate (file);if (!error) - error =do_truncate (file_mnt_idmap (f.file), dentry, length, -ATTR_MTIME |ATTR_CTIME , f.file); + error =do_truncate (file_mnt_idmap (file), dentry, length, +ATTR_MTIME |ATTR_CTIME , file);sb_end_write (inode->i_sb); -out_putf: + +out: +return error; +} + +long do_sys_ftruncate (unsigned int fd,loff_t length,int small) +{ +struct fd f; +int error; + + error = -EINVAL ; +if (length <0 ) + goto out; + error = -EBADF ; + f =fdget (fd); +if (!f.file) + goto out; + + error =__do_ftruncate (f.file, length, small); +fdput (f); out:return error;
include/linux/syscalls.h +2 -0
@@ -1229,6 +1229,8 @@ static inline long ksys_lchown(const char __user *filename, uid_t user, AT_SYMLINK_NOFOLLOW); } +extern long __do_ftruncate (struct file *file,loff_t length,int small); +extern long do_sys_ftruncate (unsigned int fd,loff_t length,int small);static inline long ksys_ftruncate (unsigned int fd,loff_t length)
Signature · 1 line
2.34.1
PATCH v2 2/2 io_uring: add support for ftruncate
Libraries that are built on io_uring currently need to maintain a separate thread pool implementation when they want to truncate a file.
--- include/uapi/linux/io_uring.h | 1 + io_uring/Makefile | 2 +- io_uring/opdef.c | 9 +++++++ io_uring/truncate.c | 47 +++++++++++++++++++++++++++++++++++ io_uring/truncate.h | 4 +++ 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 io_uring/truncate.c create mode 100644 io_uring/truncate.h
include/uapi/linux/io_uring.h +1 -0
@@ -253,6 +253,7 @@ enum io_uring_op {IORING_OP_FUTEX_WAIT ,IORING_OP_FUTEX_WAKE ,IORING_OP_FUTEX_WAITV , +IORING_OP_FTRUNCATE ,/* this goes last, obviously */ IORING_OP_LAST,
io_uring/Makefile +1 -1
@@ -8,6 +8,6 @@ obj-$(CONFIG_IO_URING) += io_uring.o xattr.o nop.o fs.o splice.o \ statx.o net.o msg_ring.o timeout.o \ sqpoll.o fdinfo.o tctx.o poll.o \ cancel.o kbuf.o rsrc.o rw.o opdef.o \ - notif.o waitid.o + notif.o waitid.o truncate.o obj-$(CONFIG_IO_WQ) += io-wq.o obj-$(CONFIG_FUTEX) += futex.o
io_uring/opdef.c +9 -0
@@ -35,6 +35,7 @@#include "rw.h" #include "waitid.h" #include "futex.h" +#include "truncate.h" static int io_no_issue (struct io_kiocb *req,unsigned int issue_flags) {
@@ -469,6 +470,11 @@ const struct io_issue_def io_issue_defs[] = { .prep = io_eopnotsupp_prep, #endif }, + [IORING_OP_FTRUNCATE ] = { + .needs_file =1 , + .prep = io_ftruncate_prep, + .issue = io_ftruncate, + }, };const struct io_cold_def io_cold_defs[] = {
@@ -704,6 +710,9 @@ const struct io_cold_def io_cold_defs[] = { [IORING_OP_FUTEX_WAITV ] = { .name ="FUTEX_WAITV" , }, + [IORING_OP_FTRUNCATE ] = { + .name ="FTRUNCATE" , + }, };const char *io_uring_get_opcode (u8 opcode)
io_uring/truncate.c new file +47 -0
47 lines not on this page · raw message
io_uring/truncate.h new file +4 -0
@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 + +int io_ftruncate_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe); +int io_ftruncate (struct io_kiocb *req,unsigned int issue_flags);
Signature · 1 line
2.34.1