|
@@ -39,7 +39,6 @@ const struct file_operations affs_file_operations = {
|
|
|
};
|
|
|
|
|
|
const struct inode_operations affs_file_inode_operations = {
|
|
|
- .truncate = affs_truncate,
|
|
|
.setattr = affs_notify_change,
|
|
|
};
|
|
|
|
|
@@ -402,6 +401,16 @@ static int affs_readpage(struct file *file, struct page *page)
|
|
|
return block_read_full_page(page, affs_get_block);
|
|
|
}
|
|
|
|
|
|
+static void affs_write_failed(struct address_space *mapping, loff_t to)
|
|
|
+{
|
|
|
+ struct inode *inode = mapping->host;
|
|
|
+
|
|
|
+ if (to > inode->i_size) {
|
|
|
+ truncate_pagecache(inode, to, inode->i_size);
|
|
|
+ affs_truncate(inode);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
static int affs_write_begin(struct file *file, struct address_space *mapping,
|
|
|
loff_t pos, unsigned len, unsigned flags,
|
|
|
struct page **pagep, void **fsdata)
|
|
@@ -412,11 +421,8 @@ static int affs_write_begin(struct file *file, struct address_space *mapping,
|
|
|
ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
|
|
|
affs_get_block,
|
|
|
&AFFS_I(mapping->host)->mmu_private);
|
|
|
- if (unlikely(ret)) {
|
|
|
- loff_t isize = mapping->host->i_size;
|
|
|
- if (pos + len > isize)
|
|
|
- vmtruncate(mapping->host, isize);
|
|
|
- }
|
|
|
+ if (unlikely(ret))
|
|
|
+ affs_write_failed(mapping, pos + len);
|
|
|
|
|
|
return ret;
|
|
|
}
|