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/bfs/file.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/bfs/file.c')
| -rw-r--r-- | fs/bfs/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/bfs/file.c b/fs/bfs/file.c index eb67edd0f8ea..f20e8a71062f 100644 --- a/fs/bfs/file.c +++ b/fs/bfs/file.c | |||
| @@ -186,7 +186,6 @@ static sector_t bfs_bmap(struct address_space *mapping, sector_t block) | |||
| 186 | const struct address_space_operations bfs_aops = { | 186 | const struct address_space_operations bfs_aops = { |
| 187 | .readpage = bfs_readpage, | 187 | .readpage = bfs_readpage, |
| 188 | .writepage = bfs_writepage, | 188 | .writepage = bfs_writepage, |
| 189 | .sync_page = block_sync_page, | ||
| 190 | .write_begin = bfs_write_begin, | 189 | .write_begin = bfs_write_begin, |
| 191 | .write_end = generic_write_end, | 190 | .write_end = generic_write_end, |
| 192 | .bmap = bfs_bmap, | 191 | .bmap = bfs_bmap, |