libceph: introduce ceph_x_encrypt_offset()

idryomov · idryomov · commit 55d9cc834f93 · 2016-12-12T23:09:19.000+01:00
Signed-off-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
Reviewed-by: Sage Weil &lt;sage@redhat.com&gt;
diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c
@@ -39,10 +39,14 @@ static int ceph_x_should_authenticate(struct ceph_auth_client *ac)
 	return need != 0;
 }
 
+static int ceph_x_encrypt_offset(void)
+{
+	return sizeof(u32) + sizeof(struct ceph_x_encrypt_header);
+}
+
 static int ceph_x_encrypt_buflen(int ilen)
 {
-	return sizeof(struct ceph_x_encrypt_header) + ilen + 16 +
-		sizeof(u32);
+	return ceph_x_encrypt_offset() + ilen + 16;
 }
 
 static int ceph_x_encrypt(struct ceph_crypto_key *secret,

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,14 @@ static int ceph_x_should_authenticate(struct ceph_auth_client *ac)`
`39`	`39`	`return need != 0;`
`40`	`40`	`}`
`41`	`41`
	`42`	`+static int ceph_x_encrypt_offset(void)`
	`43`	`+{`
	`44`	`+ return sizeof(u32) + sizeof(struct ceph_x_encrypt_header);`
	`45`	`+}`
	`46`	`+`
`42`	`47`	`static int ceph_x_encrypt_buflen(int ilen)`
`43`	`48`	`{`
`44`		`- return sizeof(struct ceph_x_encrypt_header) + ilen + 16 +`
`45`		`- sizeof(u32);`
	`49`	`+ return ceph_x_encrypt_offset() + ilen + 16;`
`46`	`50`	`}`
`47`	`51`
`48`	`52`	`static int ceph_x_encrypt(struct ceph_crypto_key *secret,`