diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /fs/minix/inode.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'fs/minix/inode.c')
| -rw-r--r-- | fs/minix/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index ae0b83f476a6..adcdc0a4e182 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c | |||
| @@ -399,7 +399,6 @@ static sector_t minix_bmap(struct address_space *mapping, sector_t block) | |||
| 399 | static const struct address_space_operations minix_aops = { | 399 | static const struct address_space_operations minix_aops = { |
| 400 | .readpage = minix_readpage, | 400 | .readpage = minix_readpage, |
| 401 | .writepage = minix_writepage, | 401 | .writepage = minix_writepage, |
| 402 | .sync_page = block_sync_page, | ||
| 403 | .write_begin = minix_write_begin, | 402 | .write_begin = minix_write_begin, |
| 404 | .write_end = generic_write_end, | 403 | .write_end = generic_write_end, |
| 405 | .bmap = minix_bmap | 404 | .bmap = minix_bmap |