diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /fs/sysv/itree.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'fs/sysv/itree.c')
| -rw-r--r-- | fs/sysv/itree.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c index 9ca66276315e..fa8d43c92bb8 100644 --- a/fs/sysv/itree.c +++ b/fs/sysv/itree.c | |||
| @@ -488,7 +488,6 @@ static sector_t sysv_bmap(struct address_space *mapping, sector_t block) | |||
| 488 | const struct address_space_operations sysv_aops = { | 488 | const struct address_space_operations sysv_aops = { |
| 489 | .readpage = sysv_readpage, | 489 | .readpage = sysv_readpage, |
| 490 | .writepage = sysv_writepage, | 490 | .writepage = sysv_writepage, |
| 491 | .sync_page = block_sync_page, | ||
| 492 | .write_begin = sysv_write_begin, | 491 | .write_begin = sysv_write_begin, |
| 493 | .write_end = generic_write_end, | 492 | .write_end = generic_write_end, |
| 494 | .bmap = sysv_bmap | 493 | .bmap = sysv_bmap |