fsfreeze: replace sb_start_write with sb_start_write_killable
Subsystems (8)
RFC PATCH v2 2/2 fsfreeze: replace sb_start_write with sb_start_write_killable
Replace sb_start_write with sb_start_write_killable where it's possible to manage a SIGKILL.
Signed-of-by Marco Stornelli <[email protected]>
--- fs/btrfs/file.c | 4 +++- fs/cifs/file.c | 4 +++- fs/fuse/file.c | 4 +++- fs/ntfs/file.c | 4 +++- fs/ocfs2/file.c | 4 +++- fs/open.c | 8 ++++++-- fs/splice.c | 4 +++- fs/xfs/xfs_file.c | 4 +++- mm/filemap.c | 4 +++- mm/filemap_xip.c | 4 +++- 10 files changed, 33 insertions(+), 11 deletions(-)
fs/btrfs/file.c +3 -1
@@ -1514,7 +1514,9 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,size_t count, ocount;bool sync = (file->f_flags &O_DSYNC ) ||IS_SYNC (file->f_mapping->host); -sb_start_write (inode->i_sb); + err =sb_start_write_killable (inode->i_sb); +if (err) +return err;mutex_lock (&inode->i_mutex);
fs/cifs/file.c +3 -1
@@ -2520,7 +2520,9 @@ cifs_writev(struct kiocb *iocb, const struct iovec *iov,BUG_ON (iocb->ki_pos != pos); -sb_start_write (inode->i_sb); + rc =sb_start_write_killable (inode->i_sb); +if (rc) +return rc;/* * We need to hold the sem to be sure nobody modifies lock list
fs/fuse/file.c +3 -1
@@ -971,7 +971,9 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,return err; count = ocount; -sb_start_write (inode->i_sb); + err =sb_start_write_killable (inode->i_sb); +if (err) +return err;mutex_lock (&inode->i_mutex);/* We can write back this queue in page reclaim */
fs/ntfs/file.c +3 -1
@@ -2129,7 +2129,9 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,BUG_ON (iocb->ki_pos != pos); -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret;mutex_lock (&inode->i_mutex); ret =ntfs_file_aio_write_nolock (iocb, iov, nr_segs, &iocb->ki_pos);mutex_unlock (&inode->i_mutex);
fs/ocfs2/file.c +3 -1
@@ -2248,7 +2248,9 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,if (iocb->ki_left ==0 )return 0 ; -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret; appending = file->f_flags &O_APPEND ?1 :0 ; direct_io = file->f_flags &O_DIRECT ?1 :0 ;
fs/open.c +6 -2
@@ -182,7 +182,9 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)if (IS_APPEND (inode)) goto out_putf; -sb_start_write (inode->i_sb); + error =sb_start_write_killable (inode->i_sb); +if (error) +return error; error =locks_verify_truncate (inode, f.file, length);if (!error) error =security_path_truncate (&f.file->f_path);
@@ -293,7 +295,9 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)if (!file->f_op->fallocate)return -EOPNOTSUPP ; -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret; ret = file->f_op->fallocate (file, mode, offset, len);sb_end_write (inode->i_sb);return ret;
fs/splice.c +3 -1
@@ -1000,7 +1000,9 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, };ssize_t ret; -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret;pipe_lock (pipe);
fs/xfs/xfs_file.c +3 -1
@@ -775,7 +775,9 @@ xfs_file_aio_write(if (ocount ==0 )return 0 ; -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret;if (XFS_FORCED_SHUTDOWN (ip->i_mount)) { ret = -EIO ;
mm/filemap.c +3 -1
@@ -2528,7 +2528,9 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,BUG_ON (iocb->ki_pos != pos); -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret;mutex_lock (&inode->i_mutex); ret =__generic_file_aio_write (iocb, iov, nr_segs, &iocb->ki_pos);mutex_unlock (&inode->i_mutex);
mm/filemap_xip.c +3 -1
@@ -404,7 +404,9 @@ xip_file_write(struct file *filp, const char __user *buf, size_t len,loff_t pos;ssize_t ret; -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret;mutex_lock (&inode->i_mutex);
Signature · 1 line
1.7.3.4
Jan Kara
maintainerQuoted 2 lines · Marco Stornelli
Replace
sb_start_writewithsb_start_write_killablewhere it's possible to manage a SIGKILL.
This still doesn't seem to be based on the freezing changes that are in
linux-next, right? sb_start_write() calls have moved significantly there.
Honza
Quoted 178 lines
Signed-of-by Marco Stornelli <[email protected]>--- fs/btrfs/file.c | 4 +++- fs/cifs/file.c | 4 +++- fs/fuse/file.c | 4 +++- fs/ntfs/file.c | 4 +++- fs/ocfs2/file.c | 4 +++- fs/open.c | 8 ++++++-- fs/splice.c | 4 +++- fs/xfs/xfs_file.c | 4 +++- mm/filemap.c | 4 +++- mm/filemap_xip.c | 4 +++- 10 files changed, 33 insertions(+), 11 deletions(-)fs/btrfs/file.c +3
-1@@ -1514,7 +1514,9 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,size_t count, ocount;bool sync = (file->f_flags &O_DSYNC ) ||IS_SYNC (file->f_mapping->host); -sb_start_write (inode->i_sb); + err =sb_start_write_killable (inode->i_sb); +if (err) +return err;mutex_lock (&inode->i_mutex);fs/cifs/file.c +3
-1@@ -2520,7 +2520,9 @@ cifs_writev(struct kiocb *iocb, const struct iovec *iov,BUG_ON (iocb->ki_pos != pos); -sb_start_write (inode->i_sb); + rc =sb_start_write_killable (inode->i_sb); +if (rc) +return rc;/* * We need to hold the sem to be sure nobody modifies lock list fs/fuse/file.c +3
-1@@ -971,7 +971,9 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,return err; count = ocount; -sb_start_write (inode->i_sb); + err =sb_start_write_killable (inode->i_sb); +if (err) +return err;mutex_lock (&inode->i_mutex);/* We can write back this queue in page reclaim */ fs/ntfs/file.c +3
-1@@ -2129,7 +2129,9 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,BUG_ON (iocb->ki_pos != pos); -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret;mutex_lock (&inode->i_mutex); ret =ntfs_file_aio_write_nolock (iocb, iov, nr_segs, &iocb->ki_pos);mutex_unlock (&inode->i_mutex);fs/ocfs2/file.c +3
-1@@ -2248,7 +2248,9 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,if (iocb->ki_left ==0 )return 0 ; -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret; appending = file->f_flags &O_APPEND ?1 :0 ; direct_io = file->f_flags &O_DIRECT ?1 :0 ;fs/open.c +6
-2@@ -182,7 +182,9 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)if (IS_APPEND (inode)) goto out_putf; -sb_start_write (inode->i_sb); + error =sb_start_write_killable (inode->i_sb); +if (error) +return error; error =locks_verify_truncate (inode, f.file, length);if (!error) error =security_path_truncate (&f.file->f_path);@@ -293,7 +295,9 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)if (!file->f_op->fallocate)return -EOPNOTSUPP ; -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret; ret = file->f_op->fallocate (file, mode, offset, len);sb_end_write (inode->i_sb);return ret;fs/splice.c +3
-1@@ -1000,7 +1000,9 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, };ssize_t ret; -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret;pipe_lock (pipe);fs/xfs/xfs_file.c +3
-1@@ -775,7 +775,9 @@ xfs_file_aio_write(if (ocount ==0 )return 0 ; -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret;if (XFS_FORCED_SHUTDOWN (ip->i_mount)) { ret = -EIO ;mm/filemap.c +3
-1@@ -2528,7 +2528,9 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,BUG_ON (iocb->ki_pos != pos); -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret;mutex_lock (&inode->i_mutex); ret =__generic_file_aio_write (iocb, iov, nr_segs, &iocb->ki_pos);mutex_unlock (&inode->i_mutex);mm/filemap_xip.c +3
-1@@ -404,7 +404,9 @@ xip_file_write(struct file *filp, const char __user *buf, size_t len,loff_t pos;ssize_t ret; -sb_start_write (inode->i_sb); + ret =sb_start_write_killable (inode->i_sb); +if (ret) +return ret;mutex_lock (&inode->i_mutex);Signature · 1 line
1.7.3.4
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR