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/omfs/file.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/omfs/file.c')
| -rw-r--r-- | fs/omfs/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/omfs/file.c b/fs/omfs/file.c index 8a6d34fa668a..d738a7e493dd 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c | |||
| @@ -372,7 +372,6 @@ const struct address_space_operations omfs_aops = { | |||
| 372 | .readpages = omfs_readpages, | 372 | .readpages = omfs_readpages, |
| 373 | .writepage = omfs_writepage, | 373 | .writepage = omfs_writepage, |
| 374 | .writepages = omfs_writepages, | 374 | .writepages = omfs_writepages, |
| 375 | .sync_page = block_sync_page, | ||
| 376 | .write_begin = omfs_write_begin, | 375 | .write_begin = omfs_write_begin, |
| 377 | .write_end = generic_write_end, | 376 | .write_end = generic_write_end, |
| 378 | .bmap = omfs_bmap, | 377 | .bmap = omfs_bmap, |