From: Jens Axboe On Tue, Nov 06 2007, akpm@linux-foundation.org wrote: > > The patch titled > jens-broke-reiser4 > has been added to the -mm tree. Its filename is > jens-broke-reiser4.patch > > *** Remember to use Documentation/SubmitChecklist when testing your code *** > > See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find > out what to do about this > > ------------------------------------------------------ > Subject: jens-broke-reiser4 > From: Andrew Morton > > fs/reiser4/plugin/file/cryptcompress.c: In function 'reiser4_deflate_cluster': > fs/reiser4/plugin/file/cryptcompress.c:1120: error: 'struct scatterlist' has no member named 'page' > fs/reiser4/plugin/file/cryptcompress.c:1124: error: 'struct scatterlist' has no member named 'page' > fs/reiser4/plugin/file/cryptcompress.c: In function 'reiser4_inflate_cluster': > fs/reiser4/plugin/file/cryptcompress.c:1184: error: 'struct scatterlist' has no member named 'page' > fs/reiser4/plugin/file/cryptcompress.c:1188: error: 'struct scatterlist' has no member named 'page' > > Please send a fix against next -mm. Here's one for 2.6.23-mm1, should apply fine for you now. Cc: Edward Shishkin Cc: "Vladimir V. Saveliev" Signed-off-by: Andrew Morton --- fs/reiser4/plugin/file/cryptcompress.c | 24 +++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff -puN fs/reiser4/plugin/file/cryptcompress.c~jens-broke-reiser4patch-added-to-mm-tree fs/reiser4/plugin/file/cryptcompress.c --- a/fs/reiser4/plugin/file/cryptcompress.c~jens-broke-reiser4patch-added-to-mm-tree +++ a/fs/reiser4/plugin/file/cryptcompress.c @@ -15,12 +15,12 @@ #include "../../tree_walk.h" #include "cryptcompress.h" -#include #include #include #include #include #include +#include /* Managing primary and secondary caches by Reiser4 @@ -206,9 +206,7 @@ static int create_keyid (struct reiser4_ memcpy(cmem, data->keyid, data->keyid_size); memset(cmem + data->keyid_size, 0, pad); - sg.page = virt_to_page(cmem); - sg.offset = offset_in_page(cmem); - sg.length = data->keyid_size + pad; + sg_init_one(&sg, cmem, data->keyid_size + pad); ret = crypto_blkcipher_encrypt(&cdesc, &sg, &sg, data->keyid_size + pad); @@ -1117,13 +1115,8 @@ int reiser4_deflate_cluster(struct clust return result; align_or_cut_overhead(inode, clust, WRITE_OP); - src.page = virt_to_page(tfm_input_data(clust)); - src.offset = offset_in_page(tfm_input_data(clust)); - src.length = tc->len; - - dst.page = virt_to_page(tfm_output_data(clust)); - dst.offset = offset_in_page(tfm_output_data(clust)); - dst.length = tc->len; + sg_init_one(&src, tfm_input_data(clust), tc->len); + sg_init_one(&dst, tfm_output_data(clust), tc->len); result = crypto_blkcipher_encrypt(&desc, &dst, &src, tc->len); if (result) { @@ -1181,13 +1174,8 @@ int reiser4_inflate_cluster(struct clust return result; assert("edward-909", tfm_cluster_is_set(tc)); - src.page = virt_to_page(tfm_input_data(clust)); - src.offset = offset_in_page(tfm_input_data(clust)); - src.length = tc->len; - - dst.page = virt_to_page(tfm_output_data(clust)); - dst.offset = offset_in_page(tfm_output_data(clust)); - dst.length = tc->len; + sg_init_one(&src, tfm_input_data(clust), tc->len); + sg_init_one(&dst, tfm_output_data(clust), tc->len); result = crypto_blkcipher_decrypt(&desc, &dst, &src, tc->len); if (result) { _