Commit fa9b227e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro

xfs: new truncate sequence

Convert XFS to the new truncate sequence.  We still can have errors after
updating the file size in xfs_setattr, but these are real I/O errors and lead
to a transaction abort and filesystem shutdown, so they are not an issue.

Errors from ->write_begin and write_end can now be handled correctly because
we can actually get rid of the delalloc extents while previous the buffer
state was stipped in block_invalidatepage.

There is still no error handling for ->direct_IO, because doing so will need
some major restructuring given that we only have the iolock shared and do not
hold i_mutex at all.  Fortunately leaving the normally allocated blocks behind
there is not a major issue and this will get cleaned up by xfs_free_eofblock
later.

Note: the patch is against Al's vfs.git tree as that contains the nessecary
preparations.  I'd prefer to get it applied there so that we can get some
testing in linux-next.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2f246fd0
...@@ -1494,6 +1494,22 @@ xfs_vm_direct_IO( ...@@ -1494,6 +1494,22 @@ xfs_vm_direct_IO(
return ret; return ret;
} }
STATIC void
xfs_vm_write_failed(
struct address_space *mapping,
loff_t to)
{
struct inode *inode = mapping->host;
if (to > inode->i_size) {
struct iattr ia = {
.ia_valid = ATTR_SIZE | ATTR_FORCE,
.ia_size = inode->i_size,
};
xfs_setattr(XFS_I(inode), &ia, XFS_ATTR_NOLOCK);
}
}
STATIC int STATIC int
xfs_vm_write_begin( xfs_vm_write_begin(
struct file *file, struct file *file,
...@@ -1508,12 +1524,26 @@ xfs_vm_write_begin( ...@@ -1508,12 +1524,26 @@ xfs_vm_write_begin(
ret = block_write_begin(mapping, pos, len, flags | AOP_FLAG_NOFS, ret = block_write_begin(mapping, pos, len, flags | AOP_FLAG_NOFS,
pagep, xfs_get_blocks); pagep, xfs_get_blocks);
if (unlikely(ret)) { if (unlikely(ret))
loff_t isize = mapping->host->i_size; xfs_vm_write_failed(mapping, pos + len);
if (pos + len > isize) return ret;
vmtruncate(mapping->host, isize); }
}
STATIC int
xfs_vm_write_end(
struct file *file,
struct address_space *mapping,
loff_t pos,
unsigned len,
unsigned copied,
struct page *page,
void *fsdata)
{
int ret;
ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);
if (unlikely(ret < len))
xfs_vm_write_failed(mapping, pos + len);
return ret; return ret;
} }
...@@ -1559,7 +1589,7 @@ const struct address_space_operations xfs_address_space_operations = { ...@@ -1559,7 +1589,7 @@ const struct address_space_operations xfs_address_space_operations = {
.releasepage = xfs_vm_releasepage, .releasepage = xfs_vm_releasepage,
.invalidatepage = xfs_vm_invalidatepage, .invalidatepage = xfs_vm_invalidatepage,
.write_begin = xfs_vm_write_begin, .write_begin = xfs_vm_write_begin,
.write_end = generic_write_end, .write_end = xfs_vm_write_end,
.bmap = xfs_vm_bmap, .bmap = xfs_vm_bmap,
.direct_IO = xfs_vm_direct_IO, .direct_IO = xfs_vm_direct_IO,
.migratepage = buffer_migrate_page, .migratepage = buffer_migrate_page,
......
...@@ -540,21 +540,6 @@ xfs_vn_setattr( ...@@ -540,21 +540,6 @@ xfs_vn_setattr(
return -xfs_setattr(XFS_I(dentry->d_inode), iattr, 0); return -xfs_setattr(XFS_I(dentry->d_inode), iattr, 0);
} }
/*
* block_truncate_page can return an error, but we can't propagate it
* at all here. Leave a complaint + stack trace in the syslog because
* this could be bad. If it is bad, we need to propagate the error further.
*/
STATIC void
xfs_vn_truncate(
struct inode *inode)
{
int error;
error = block_truncate_page(inode->i_mapping, inode->i_size,
xfs_get_blocks);
WARN_ON(error);
}
STATIC long STATIC long
xfs_vn_fallocate( xfs_vn_fallocate(
struct inode *inode, struct inode *inode,
...@@ -694,7 +679,6 @@ xfs_vn_fiemap( ...@@ -694,7 +679,6 @@ xfs_vn_fiemap(
static const struct inode_operations xfs_inode_operations = { static const struct inode_operations xfs_inode_operations = {
.check_acl = xfs_check_acl, .check_acl = xfs_check_acl,
.truncate = xfs_vn_truncate,
.getattr = xfs_vn_getattr, .getattr = xfs_vn_getattr,
.setattr = xfs_vn_setattr, .setattr = xfs_vn_setattr,
.setxattr = generic_setxattr, .setxattr = generic_setxattr,
......
...@@ -156,8 +156,6 @@ ...@@ -156,8 +156,6 @@
*/ */
#define xfs_sort(a,n,s,fn) sort(a,n,s,fn,NULL) #define xfs_sort(a,n,s,fn) sort(a,n,s,fn,NULL)
#define xfs_stack_trace() dump_stack() #define xfs_stack_trace() dump_stack()
#define xfs_itruncate_data(ip, off) \
(-vmtruncate(VFS_I(ip), (off)))
/* Move the kernel do_div definition off to one side */ /* Move the kernel do_div definition off to one side */
......
...@@ -221,8 +221,11 @@ xfs_setattr( ...@@ -221,8 +221,11 @@ xfs_setattr(
* transaction to modify the i_size. * transaction to modify the i_size.
*/ */
code = xfs_zero_eof(ip, iattr->ia_size, ip->i_size); code = xfs_zero_eof(ip, iattr->ia_size, ip->i_size);
if (code)
goto error_return;
} }
xfs_iunlock(ip, XFS_ILOCK_EXCL); xfs_iunlock(ip, XFS_ILOCK_EXCL);
lock_flags &= ~XFS_ILOCK_EXCL;
/* /*
* We are going to log the inode size change in this * We are going to log the inode size change in this
...@@ -236,36 +239,35 @@ xfs_setattr( ...@@ -236,36 +239,35 @@ xfs_setattr(
* really care about here and prevents waiting for other data * really care about here and prevents waiting for other data
* not within the range we care about here. * not within the range we care about here.
*/ */
if (!code && if (ip->i_size != ip->i_d.di_size &&
ip->i_size != ip->i_d.di_size &&
iattr->ia_size > ip->i_d.di_size) { iattr->ia_size > ip->i_d.di_size) {
code = xfs_flush_pages(ip, code = xfs_flush_pages(ip,
ip->i_d.di_size, iattr->ia_size, ip->i_d.di_size, iattr->ia_size,
XBF_ASYNC, FI_NONE); XBF_ASYNC, FI_NONE);
if (code)
goto error_return;
} }
/* wait for all I/O to complete */ /* wait for all I/O to complete */
xfs_ioend_wait(ip); xfs_ioend_wait(ip);
if (!code) code = -block_truncate_page(inode->i_mapping, iattr->ia_size,
code = xfs_itruncate_data(ip, iattr->ia_size); xfs_get_blocks);
if (code) { if (code)
ASSERT(tp == NULL);
lock_flags &= ~XFS_ILOCK_EXCL;
ASSERT(lock_flags == XFS_IOLOCK_EXCL || !need_iolock);
goto error_return; goto error_return;
}
tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_SIZE); tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_SIZE);
if ((code = xfs_trans_reserve(tp, 0, code = xfs_trans_reserve(tp, 0, XFS_ITRUNCATE_LOG_RES(mp), 0,
XFS_ITRUNCATE_LOG_RES(mp), 0,
XFS_TRANS_PERM_LOG_RES, XFS_TRANS_PERM_LOG_RES,
XFS_ITRUNCATE_LOG_COUNT))) { XFS_ITRUNCATE_LOG_COUNT);
xfs_trans_cancel(tp, 0); if (code)
if (need_iolock) goto error_return;
xfs_iunlock(ip, XFS_IOLOCK_EXCL);
return code; truncate_setsize(inode, iattr->ia_size);
}
commit_flags = XFS_TRANS_RELEASE_LOG_RES; commit_flags = XFS_TRANS_RELEASE_LOG_RES;
lock_flags |= XFS_ILOCK_EXCL;
xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_ilock(ip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, ip); xfs_trans_ijoin(tp, ip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment