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/efs/inode.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/efs/inode.c')
| -rw-r--r-- | fs/efs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/efs/inode.c b/fs/efs/inode.c index a8e7797b9477..9c13412e6c99 100644 --- a/fs/efs/inode.c +++ b/fs/efs/inode.c | |||
| @@ -23,7 +23,6 @@ static sector_t _efs_bmap(struct address_space *mapping, sector_t block) | |||
| 23 | } | 23 | } |
| 24 | static const struct address_space_operations efs_aops = { | 24 | static const struct address_space_operations efs_aops = { |
| 25 | .readpage = efs_readpage, | 25 | .readpage = efs_readpage, |
| 26 | .sync_page = block_sync_page, | ||
| 27 | .bmap = _efs_bmap | 26 | .bmap = _efs_bmap |
| 28 | }; | 27 | }; |
| 29 | 28 | ||