From 45fdd14b920846fdc7f3f89bb0eea4286863700d Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Mon, 31 Dec 2007 04:56:21 +0000 Subject: [PATCH] --- yaml --- r: 77297 b: refs/heads/master c: 28c5a02a11f70bb1fd8dd3b633206e2db3220308 h: refs/heads/master i: 77295: 639d957b03d38b53244cb461f37898b1f03c290f v: v3 --- [refs] | 2 +- trunk/fs/cifs/sess.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 614534ebb0d2..9f7cc926abe1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb5a9a04d4cab4b13d63ac5cd3e1fb35f9583607 +refs/heads/master: 28c5a02a11f70bb1fd8dd3b633206e2db3220308 diff --git a/trunk/fs/cifs/sess.c b/trunk/fs/cifs/sess.c index ce698d5f6107..d2153abcba6d 100644 --- a/trunk/fs/cifs/sess.c +++ b/trunk/fs/cifs/sess.c @@ -542,7 +542,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, if (ses->capabilities & CAP_UNICODE) { /* unicode strings must be word aligned */ - if (iov[0].iov_len % 2) { + if ((iov[0].iov_len + iov[1].iov_len) % 2) { *bcc_ptr = 0; bcc_ptr++; }