aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/lustre/lnet/lnet/nidstrings.c2
-rw-r--r--drivers/staging/lustre/lustre/osc/osc_request.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/lustre/lnet/lnet/nidstrings.c b/drivers/staging/lustre/lnet/lnet/nidstrings.c
index e1f1ca8f8860..a9fe3e69daae 100644
--- a/drivers/staging/lustre/lnet/lnet/nidstrings.c
+++ b/drivers/staging/lustre/lnet/lnet/nidstrings.c
@@ -247,10 +247,8 @@ parse_nidrange(struct cfs_lstr *src, struct list_head *nidlist)
247{ 247{
248 struct cfs_lstr addrrange; 248 struct cfs_lstr addrrange;
249 struct cfs_lstr net; 249 struct cfs_lstr net;
250 struct cfs_lstr tmp;
251 struct nidrange *nr; 250 struct nidrange *nr;
252 251
253 tmp = *src;
254 if (!cfs_gettok(src, '@', &addrrange)) 252 if (!cfs_gettok(src, '@', &addrrange))
255 goto failed; 253 goto failed;
256 254
diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
index 7611a3395d84..7b6fda53f968 100644
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@ -933,7 +933,6 @@ static u32 osc_checksum_bulk(int nob, u32 pg_count,
933 int i = 0; 933 int i = 0;
934 struct cfs_crypto_hash_desc *hdesc; 934 struct cfs_crypto_hash_desc *hdesc;
935 unsigned int bufsize; 935 unsigned int bufsize;
936 int err;
937 unsigned char cfs_alg = cksum_obd2cfs(cksum_type); 936 unsigned char cfs_alg = cksum_obd2cfs(cksum_type);
938 937
939 LASSERT(pg_count > 0); 938 LASSERT(pg_count > 0);
@@ -975,7 +974,7 @@ static u32 osc_checksum_bulk(int nob, u32 pg_count,
975 } 974 }
976 975
977 bufsize = sizeof(cksum); 976 bufsize = sizeof(cksum);
978 err = cfs_crypto_hash_final(hdesc, (unsigned char *)&cksum, &bufsize); 977 cfs_crypto_hash_final(hdesc, (unsigned char *)&cksum, &bufsize);
979 978
980 /* For sending we only compute the wrong checksum instead 979 /* For sending we only compute the wrong checksum instead
981 * of corrupting the data so it is still correct on a redo 980 * of corrupting the data so it is still correct on a redo