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/omfs/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/omfs/file.c')
| -rw-r--r-- | fs/omfs/file.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/omfs/file.c b/fs/omfs/file.c index 8a6d34fa668a..2c6d95257a4d 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Released under GPL v2. | 4 | * Released under GPL v2. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/version.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/fs.h> | 8 | #include <linux/fs.h> |
| 10 | #include <linux/buffer_head.h> | 9 | #include <linux/buffer_head.h> |
| @@ -372,7 +371,6 @@ const struct address_space_operations omfs_aops = { | |||
| 372 | .readpages = omfs_readpages, | 371 | .readpages = omfs_readpages, |
| 373 | .writepage = omfs_writepage, | 372 | .writepage = omfs_writepage, |
| 374 | .writepages = omfs_writepages, | 373 | .writepages = omfs_writepages, |
| 375 | .sync_page = block_sync_page, | ||
| 376 | .write_begin = omfs_write_begin, | 374 | .write_begin = omfs_write_begin, |
| 377 | .write_end = generic_write_end, | 375 | .write_end = generic_write_end, |
| 378 | .bmap = omfs_bmap, | 376 | .bmap = omfs_bmap, |