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/jfs/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/jfs/inode.c')
| -rw-r--r-- | fs/jfs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index 9978803ceedc..eddbb373209e 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c | |||
| @@ -352,7 +352,6 @@ const struct address_space_operations jfs_aops = { | |||
| 352 | .readpages = jfs_readpages, | 352 | .readpages = jfs_readpages, |
| 353 | .writepage = jfs_writepage, | 353 | .writepage = jfs_writepage, |
| 354 | .writepages = jfs_writepages, | 354 | .writepages = jfs_writepages, |
| 355 | .sync_page = block_sync_page, | ||
| 356 | .write_begin = jfs_write_begin, | 355 | .write_begin = jfs_write_begin, |
| 357 | .write_end = nobh_write_end, | 356 | .write_end = nobh_write_end, |
| 358 | .bmap = jfs_bmap, | 357 | .bmap = jfs_bmap, |