korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 12:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

ext4_file_write_iter: move generic_write_checks() up

Browse Source 
simpler that way...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-04-07 14:48:22 -04:00
parent 99733fa372
commit e768d7ff7b
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fs/ext4/file.c
View File

@ -99,7 +99,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
int overwrite = 0; int overwrite = 0;
size_t length = iov_iter_count(from); size_t length = iov_iter_count(from);
ssize_t ret; ssize_t ret;
loff_t pos = iocb->ki_pos; loff_t pos;
/* /*
* Unaligned direct AIO must be serialized; see comment above * Unaligned direct AIO must be serialized; see comment above
@ -109,15 +109,22 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) && ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) &&
!is_sync_kiocb(iocb) && !is_sync_kiocb(iocb) &&
(file->f_flags & O_APPEND || (file->f_flags & O_APPEND ||
ext4_unaligned_aio(inode, from, pos))) { ext4_unaligned_aio(inode, from, iocb->ki_pos))) {
aio_mutex = ext4_aio_mutex(inode); aio_mutex = ext4_aio_mutex(inode);
mutex_lock(aio_mutex); mutex_lock(aio_mutex);
ext4_unwritten_wait(inode); ext4_unwritten_wait(inode);
} }
mutex_lock(&inode->i_mutex); mutex_lock(&inode->i_mutex);
if (file->f_flags & O_APPEND) ret = generic_write_checks(file, &iocb->ki_pos, &length);
iocb->ki_pos = pos = i_size_read(inode); if (ret)
goto out;
if (length == 0)
goto out;
iov_iter_truncate(from, length);
pos = iocb->ki_pos;
/* /*
* If we have encountered a bitmap-format file, the size limit * If we have encountered a bitmap-format file, the size limit
@ -126,18 +133,16 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
if ((pos > sbi->s_bitmap_maxbytes) || if (pos >= sbi->s_bitmap_maxbytes) {
(pos == sbi->s_bitmap_maxbytes && length > 0)) {
mutex_unlock(&inode->i_mutex);
ret = -EFBIG; ret = -EFBIG;
goto errout; goto out;
} }
iov_iter_truncate(from, sbi->s_bitmap_maxbytes - pos); iov_iter_truncate(from, sbi->s_bitmap_maxbytes - pos);
length = iov_iter_count(from);
} }
iocb->private = &overwrite; iocb->private = &overwrite;
if (o_direct) { if (o_direct) {
length = iov_iter_count(from);
blk_start_plug(&plug); blk_start_plug(&plug);
@ -171,16 +176,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
} }
} }
ret = generic_write_checks(file, &iocb->ki_pos, &length);
if (ret)
goto out;
if (length == 0)
goto out;
iov_iter_truncate(from, length);
ret = __generic_file_write_iter(iocb, from); ret = __generic_file_write_iter(iocb, from);
out:
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);
if (ret > 0) { if (ret > 0) {
@ -193,7 +189,12 @@ out:
if (o_direct) if (o_direct)
blk_finish_plug(&plug); blk_finish_plug(&plug);
errout: if (aio_mutex)
mutex_unlock(aio_mutex);
return ret;
out:
mutex_unlock(&inode->i_mutex);
if (aio_mutex) if (aio_mutex)
mutex_unlock(aio_mutex); mutex_unlock(aio_mutex);
return ret; return ret;