Hello Mike! I'm currently preparing a janitorial patch series and noticed that this one already collides with some of your changes. Can I leave it to you to fix up the collision and send on?
Or maybe just run git grep ^inline drivers/scsi/*iscsi* and remove the inline from every line. Jörn -- Happiness isn't having what you want, it's wanting what you have. -- unknown Before: text data bss dec hex filename 9241 0 4 9245 241d drivers/scsi/libiscsi_tcp.o 26455 0 16 26471 6767 drivers/scsi/libiscsi.o After: text data bss dec hex filename 8897 0 4 8901 22c5 drivers/scsi/libiscsi_tcp.o 26226 0 16 26242 6682 drivers/scsi/libiscsi.o Signed-off-by: Joern Engel <[email protected]> --- drivers/scsi/libiscsi.c | 2 +- drivers/scsi/libiscsi_tcp.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 0c550d5..f209a86 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -100,7 +100,7 @@ static int iscsi_sna_lte(u32 n1, u32 n2) (n1 > n2 && (n2 - n1 < SNA32_CHECK))); } -inline void iscsi_conn_queue_work(struct iscsi_conn *conn) +void iscsi_conn_queue_work(struct iscsi_conn *conn) { struct Scsi_Host *shost = conn->session->host; struct iscsi_host *ihost = shost_priv(shost); diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c index e98ae33..f1e4beb 100644 --- a/drivers/scsi/libiscsi_tcp.c +++ b/drivers/scsi/libiscsi_tcp.c @@ -308,7 +308,7 @@ iscsi_tcp_segment_recv(struct iscsi_tcp_conn *tcp_conn, return copied; } -inline void +void iscsi_tcp_dgst_header(struct hash_desc *hash, const void *hdr, size_t hdrlen, unsigned char digest[ISCSI_DIGEST_SIZE]) { @@ -352,7 +352,7 @@ __iscsi_segment_init(struct iscsi_segment *segment, size_t size, } } -inline void +void iscsi_segment_init_linear(struct iscsi_segment *segment, void *data, size_t size, iscsi_segment_done_fn_t *done, struct hash_desc *hash) @@ -363,7 +363,7 @@ iscsi_segment_init_linear(struct iscsi_segment *segment, void *data, } EXPORT_SYMBOL_GPL(iscsi_segment_init_linear); -inline int +int iscsi_segment_seek_sg(struct iscsi_segment *segment, struct scatterlist *sg_list, unsigned int sg_count, unsigned int offset, size_t size, @@ -851,7 +851,7 @@ iscsi_tcp_hdr_recv_done(struct iscsi_tcp_conn *tcp_conn, * returns non zero if we are currently processing or setup to process * a header. */ -inline int iscsi_tcp_recv_segment_is_hdr(struct iscsi_tcp_conn *tcp_conn) +int iscsi_tcp_recv_segment_is_hdr(struct iscsi_tcp_conn *tcp_conn) { return tcp_conn->in.segment.done == iscsi_tcp_hdr_recv_done; } -- 1.7.2.3 -- You received this message because you are subscribed to the Google Groups "open-iscsi" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/open-iscsi?hl=en.
