diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /fs/jfs/inode.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
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, |