diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2015-02-02 11:29:29 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-02-02 11:29:29 -0500 |
| commit | a584143b01ce69803116ae8d0a4db382acc728d7 (patch) | |
| tree | 002733709647fa1e17683a9d21dbc23ae99e3d2d /net/ceph/auth_x.c | |
| parent | 4c94e13e9caed09103419c087f436d79f9d2faba (diff) | |
| parent | 8116bf4cb62d337c953cfa5369ef4cf83e73140c (diff) | |
| download | linux-stable-a584143b01ce69803116ae8d0a4db382acc728d7.tar.gz linux-stable-a584143b01ce69803116ae8d0a4db382acc728d7.tar.bz2 linux-stable-a584143b01ce69803116ae8d0a4db382acc728d7.zip | |
Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20
Christoph's block pnfs patches have some minor dependencies on these
lock patches.
Diffstat (limited to 'net/ceph/auth_x.c')
| -rw-r--r-- | net/ceph/auth_x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c index 15845814a0f2..ba6eb17226da 100644 --- a/net/ceph/auth_x.c +++ b/net/ceph/auth_x.c @@ -676,7 +676,7 @@ static int calcu_signature(struct ceph_x_authorizer *au, int ret; char tmp_enc[40]; __le32 tmp[5] = { - 16u, msg->hdr.crc, msg->footer.front_crc, + cpu_to_le32(16), msg->hdr.crc, msg->footer.front_crc, msg->footer.middle_crc, msg->footer.data_crc, }; ret = ceph_x_encrypt(&au->session_key, &tmp, sizeof(tmp), |