diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /fs/gfs2/aops.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'fs/gfs2/aops.c')
| -rw-r--r-- | fs/gfs2/aops.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index aad77e4f61b5..c71995b111bf 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c | |||
| @@ -1117,7 +1117,6 @@ static const struct address_space_operations gfs2_writeback_aops = { | |||
| 1117 | .writepages = gfs2_writeback_writepages, | 1117 | .writepages = gfs2_writeback_writepages, |
| 1118 | .readpage = gfs2_readpage, | 1118 | .readpage = gfs2_readpage, |
| 1119 | .readpages = gfs2_readpages, | 1119 | .readpages = gfs2_readpages, |
| 1120 | .sync_page = block_sync_page, | ||
| 1121 | .write_begin = gfs2_write_begin, | 1120 | .write_begin = gfs2_write_begin, |
| 1122 | .write_end = gfs2_write_end, | 1121 | .write_end = gfs2_write_end, |
| 1123 | .bmap = gfs2_bmap, | 1122 | .bmap = gfs2_bmap, |
| @@ -1133,7 +1132,6 @@ static const struct address_space_operations gfs2_ordered_aops = { | |||
| 1133 | .writepage = gfs2_ordered_writepage, | 1132 | .writepage = gfs2_ordered_writepage, |
| 1134 | .readpage = gfs2_readpage, | 1133 | .readpage = gfs2_readpage, |
| 1135 | .readpages = gfs2_readpages, | 1134 | .readpages = gfs2_readpages, |
| 1136 | .sync_page = block_sync_page, | ||
| 1137 | .write_begin = gfs2_write_begin, | 1135 | .write_begin = gfs2_write_begin, |
| 1138 | .write_end = gfs2_write_end, | 1136 | .write_end = gfs2_write_end, |
| 1139 | .set_page_dirty = gfs2_set_page_dirty, | 1137 | .set_page_dirty = gfs2_set_page_dirty, |
| @@ -1151,7 +1149,6 @@ static const struct address_space_operations gfs2_jdata_aops = { | |||
| 1151 | .writepages = gfs2_jdata_writepages, | 1149 | .writepages = gfs2_jdata_writepages, |
| 1152 | .readpage = gfs2_readpage, | 1150 | .readpage = gfs2_readpage, |
| 1153 | .readpages = gfs2_readpages, | 1151 | .readpages = gfs2_readpages, |
| 1154 | .sync_page = block_sync_page, | ||
| 1155 | .write_begin = gfs2_write_begin, | 1152 | .write_begin = gfs2_write_begin, |
| 1156 | .write_end = gfs2_write_end, | 1153 | .write_end = gfs2_write_end, |
| 1157 | .set_page_dirty = gfs2_set_page_dirty, | 1154 | .set_page_dirty = gfs2_set_page_dirty, |