git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
[pandora-kernel.git]
/
net
/
ceph
/
armor.c
diff --git
a/net/ceph/armor.c
b/net/ceph/armor.c
index
eb2a666
..
1fc1ee1
100644
(file)
--- a/
net/ceph/armor.c
+++ b/
net/ceph/armor.c
@@
-78,8
+78,10
@@
int ceph_unarmor(char *dst, const char *src, const char *end)
while (src < end) {
int a, b, c, d;
while (src < end) {
int a, b, c, d;
- if (src
< end && src[0] == '\n')
+ if (src
[0] == '\n') {
src++;
src++;
+ continue;
+ }
if (src + 4 > end)
return -EINVAL;
a = decode_bits(src[0]);
if (src + 4 > end)
return -EINVAL;
a = decode_bits(src[0]);