X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=crypto%2Fscatterwalk.h;h=fd5517d2a7a9f09bdb941bac45815ddca6ded48a;hb=fe70f5dfe1a7b5caab96531089dac3d8728c0ebd;hp=f1592cc2d0f42bb76132667fe69cf3f5e61bb8cb;hpb=8a84fc15ae5cafcc366dd85cf8e1ab2040679abc;p=linux-2.6-block.git

diff --git a/crypto/scatterwalk.h b/crypto/scatterwalk.h
index f1592cc2d0f4..fd5517d2a7a9 100644
--- a/crypto/scatterwalk.h
+++ b/crypto/scatterwalk.h
@@ -20,15 +20,10 @@
 
 #include "internal.h"
 
-static inline struct scatterlist *sg_next(struct scatterlist *sg)
-{
-	return (++sg)->length ? sg : (void *)sg->page;
-}
-
 static inline unsigned long scatterwalk_samebuf(struct scatter_walk *walk_in,
 						struct scatter_walk *walk_out)
 {
-	return !(((walk_in->sg->page - walk_out->sg->page) << PAGE_SHIFT) +
+	return !(((sg_page(walk_in->sg) - sg_page(walk_out->sg)) << PAGE_SHIFT) +
 		 (int)(walk_in->offset - walk_out->offset));
 }
 
@@ -60,7 +55,7 @@ static inline unsigned int scatterwalk_aligned(struct scatter_walk *walk,
 
 static inline struct page *scatterwalk_page(struct scatter_walk *walk)
 {
-	return walk->sg->page + (walk->offset >> PAGE_SHIFT);
+	return sg_page(walk->sg) + (walk->offset >> PAGE_SHIFT);
 }
 
 static inline void scatterwalk_unmap(void *vaddr, int out)
@@ -74,4 +69,7 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
 void *scatterwalk_map(struct scatter_walk *walk, int out);
 void scatterwalk_done(struct scatter_walk *walk, int out, int more);
 
+void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
+			      unsigned int start, unsigned int nbytes, int out);
+
 #endif  /* _CRYPTO_SCATTERWALK_H */