diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-02-24 14:31:04 -0500 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-02-24 14:33:45 -0500 |
| commit | 109d28152b6e9d5de64cd23e3bc08885ccb3d1ef (patch) | |
| tree | b7b8863faa05254781acfb85cc41da3eef467c6b /fs/exofs/inode.c | |
| parent | 168cf9af699e87d5a6f44b684583714ecabb8e71 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge tag 'v2.6.33' for its firewire changes since last branch point
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'fs/exofs/inode.c')
| -rw-r--r-- | fs/exofs/inode.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c index 698a8636d39c..2afbcebeda71 100644 --- a/fs/exofs/inode.c +++ b/fs/exofs/inode.c | |||
| @@ -738,13 +738,28 @@ static int exofs_write_begin_export(struct file *file, | |||
| 738 | fsdata); | 738 | fsdata); |
| 739 | } | 739 | } |
| 740 | 740 | ||
| 741 | static int exofs_write_end(struct file *file, struct address_space *mapping, | ||
| 742 | loff_t pos, unsigned len, unsigned copied, | ||
| 743 | struct page *page, void *fsdata) | ||
| 744 | { | ||
| 745 | struct inode *inode = mapping->host; | ||
| 746 | /* According to comment in simple_write_end i_mutex is held */ | ||
| 747 | loff_t i_size = inode->i_size; | ||
| 748 | int ret; | ||
| 749 | |||
| 750 | ret = simple_write_end(file, mapping,pos, len, copied, page, fsdata); | ||
| 751 | if (i_size != inode->i_size) | ||
| 752 | mark_inode_dirty(inode); | ||
| 753 | return ret; | ||
| 754 | } | ||
| 755 | |||
| 741 | const struct address_space_operations exofs_aops = { | 756 | const struct address_space_operations exofs_aops = { |
| 742 | .readpage = exofs_readpage, | 757 | .readpage = exofs_readpage, |
| 743 | .readpages = exofs_readpages, | 758 | .readpages = exofs_readpages, |
| 744 | .writepage = exofs_writepage, | 759 | .writepage = exofs_writepage, |
| 745 | .writepages = exofs_writepages, | 760 | .writepages = exofs_writepages, |
| 746 | .write_begin = exofs_write_begin_export, | 761 | .write_begin = exofs_write_begin_export, |
| 747 | .write_end = simple_write_end, | 762 | .write_end = exofs_write_end, |
| 748 | }; | 763 | }; |
| 749 | 764 | ||
| 750 | /****************************************************************************** | 765 | /****************************************************************************** |
