diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 02:58:35 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 02:58:35 -0500 |
| commit | 4c63f5646e405b5010cc9499419060bf2e838f5b (patch) | |
| tree | df91ba315032c8ec4aafeb3ab96fdfa7c6c656e1 /fs/exofs/inode.c | |
| parent | cafb0bfca1a73efd6d8a4a6a6a716e6134b96c24 (diff) | |
| parent | 69d60eb96ae8a73cf9b79cf28051caf973006011 (diff) | |
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
Conflicts:
block/blk-core.c
block/blk-flush.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
fs/nilfs2/btnode.c
fs/nilfs2/mdt.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/exofs/inode.c')
| -rw-r--r-- | fs/exofs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c index a7555238c41a..82b94c8f5d22 100644 --- a/fs/exofs/inode.c +++ b/fs/exofs/inode.c | |||
| @@ -795,7 +795,6 @@ const struct address_space_operations exofs_aops = { | |||
| 795 | .direct_IO = NULL, /* TODO: Should be trivial to do */ | 795 | .direct_IO = NULL, /* TODO: Should be trivial to do */ |
| 796 | 796 | ||
| 797 | /* With these NULL has special meaning or default is not exported */ | 797 | /* With these NULL has special meaning or default is not exported */ |
| 798 | .sync_page = NULL, | ||
| 799 | .get_xip_mem = NULL, | 798 | .get_xip_mem = NULL, |
| 800 | .migratepage = NULL, | 799 | .migratepage = NULL, |
| 801 | .launder_page = NULL, | 800 | .launder_page = NULL, |