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/ufs/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/ufs/inode.c')
| -rw-r--r-- | fs/ufs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index 03c255f12df5..27a4babe7df0 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c | |||
| @@ -552,7 +552,6 @@ static sector_t ufs_bmap(struct address_space *mapping, sector_t block) | |||
| 552 | const struct address_space_operations ufs_aops = { | 552 | const struct address_space_operations ufs_aops = { |
| 553 | .readpage = ufs_readpage, | 553 | .readpage = ufs_readpage, |
| 554 | .writepage = ufs_writepage, | 554 | .writepage = ufs_writepage, |
| 555 | .sync_page = block_sync_page, | ||
| 556 | .write_begin = ufs_write_begin, | 555 | .write_begin = ufs_write_begin, |
| 557 | .write_end = generic_write_end, | 556 | .write_end = generic_write_end, |
| 558 | .bmap = ufs_bmap | 557 | .bmap = ufs_bmap |