diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /fs/afs/file.c | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/afs/file.c')
| -rw-r--r-- | fs/afs/file.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/afs/file.c b/fs/afs/file.c index 67d6634101fd..2e8c42639eaa 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 17 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 18 | #include <linux/pagemap.h> | 18 | #include <linux/pagemap.h> |
| 19 | #include <linux/buffer_head.h> | ||
| 20 | #include "volume.h" | 19 | #include "volume.h" |
| 21 | #include "vnode.h" | 20 | #include "vnode.h" |
| 22 | #include <rxrpc/call.h> | 21 | #include <rxrpc/call.h> |
| @@ -37,7 +36,6 @@ struct inode_operations afs_file_inode_operations = { | |||
| 37 | 36 | ||
| 38 | const struct address_space_operations afs_fs_aops = { | 37 | const struct address_space_operations afs_fs_aops = { |
| 39 | .readpage = afs_file_readpage, | 38 | .readpage = afs_file_readpage, |
| 40 | .sync_page = block_sync_page, | ||
| 41 | .set_page_dirty = __set_page_dirty_nobuffers, | 39 | .set_page_dirty = __set_page_dirty_nobuffers, |
| 42 | .releasepage = afs_file_releasepage, | 40 | .releasepage = afs_file_releasepage, |
| 43 | .invalidatepage = afs_file_invalidatepage, | 41 | .invalidatepage = afs_file_invalidatepage, |