Commit f0fe1e5
ceph: plumb in decryption during reads
Force the use of sparse reads when the inode is encrypted, and add the
appropriate code to decrypt the extent map after receiving.
Note that the crypto block may be smaller than a page, but the reverse
cannot be true.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>1 parent d552077 commit f0fe1e5
2 files changed
Lines changed: 125 additions & 34 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
242 | 243 | | |
243 | 244 | | |
244 | 245 | | |
245 | | - | |
| 246 | + | |
| 247 | + | |
246 | 248 | | |
247 | 249 | | |
248 | 250 | | |
| |||
256 | 258 | | |
257 | 259 | | |
258 | 260 | | |
259 | | - | |
260 | | - | |
261 | | - | |
| 261 | + | |
262 | 262 | | |
263 | 263 | | |
264 | 264 | | |
265 | 265 | | |
266 | | - | |
267 | | - | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
268 | 280 | | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
269 | 286 | | |
270 | 287 | | |
271 | 288 | | |
| |||
336 | 353 | | |
337 | 354 | | |
338 | 355 | | |
339 | | - | |
| 356 | + | |
| 357 | + | |
340 | 358 | | |
341 | 359 | | |
342 | 360 | | |
| |||
346 | 364 | | |
347 | 365 | | |
348 | 366 | | |
349 | | - | |
350 | | - | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
351 | 371 | | |
352 | 372 | | |
353 | 373 | | |
| |||
363 | 383 | | |
364 | 384 | | |
365 | 385 | | |
| 386 | + | |
366 | 387 | | |
367 | | - | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
368 | 417 | | |
369 | 418 | | |
370 | 419 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
970 | 970 | | |
971 | 971 | | |
972 | 972 | | |
973 | | - | |
| 973 | + | |
974 | 974 | | |
975 | 975 | | |
976 | 976 | | |
| |||
1001 | 1001 | | |
1002 | 1002 | | |
1003 | 1003 | | |
| 1004 | + | |
| 1005 | + | |
| 1006 | + | |
| 1007 | + | |
| 1008 | + | |
| 1009 | + | |
| 1010 | + | |
| 1011 | + | |
1004 | 1012 | | |
1005 | 1013 | | |
1006 | | - | |
1007 | | - | |
| 1014 | + | |
| 1015 | + | |
| 1016 | + | |
1008 | 1017 | | |
1009 | 1018 | | |
1010 | 1019 | | |
| |||
1013 | 1022 | | |
1014 | 1023 | | |
1015 | 1024 | | |
| 1025 | + | |
| 1026 | + | |
| 1027 | + | |
1016 | 1028 | | |
1017 | 1029 | | |
1018 | | - | |
1019 | | - | |
| 1030 | + | |
| 1031 | + | |
1020 | 1032 | | |
1021 | 1033 | | |
1022 | 1034 | | |
1023 | 1035 | | |
1024 | 1036 | | |
1025 | 1037 | | |
1026 | 1038 | | |
1027 | | - | |
| 1039 | + | |
| 1040 | + | |
1028 | 1041 | | |
1029 | 1042 | | |
1030 | 1043 | | |
| |||
1042 | 1055 | | |
1043 | 1056 | | |
1044 | 1057 | | |
1045 | | - | |
| 1058 | + | |
1046 | 1059 | | |
1047 | 1060 | | |
1048 | 1061 | | |
| |||
1057 | 1070 | | |
1058 | 1071 | | |
1059 | 1072 | | |
| 1073 | + | |
| 1074 | + | |
| 1075 | + | |
| 1076 | + | |
| 1077 | + | |
| 1078 | + | |
| 1079 | + | |
| 1080 | + | |
| 1081 | + | |
| 1082 | + | |
| 1083 | + | |
| 1084 | + | |
| 1085 | + | |
| 1086 | + | |
| 1087 | + | |
| 1088 | + | |
| 1089 | + | |
| 1090 | + | |
| 1091 | + | |
| 1092 | + | |
| 1093 | + | |
| 1094 | + | |
| 1095 | + | |
| 1096 | + | |
| 1097 | + | |
| 1098 | + | |
1060 | 1099 | | |
1061 | 1100 | | |
| 1101 | + | |
1062 | 1102 | | |
1063 | 1103 | | |
1064 | 1104 | | |
| |||
1072 | 1112 | | |
1073 | 1113 | | |
1074 | 1114 | | |
1075 | | - | |
1076 | | - | |
1077 | | - | |
| 1115 | + | |
| 1116 | + | |
| 1117 | + | |
1078 | 1118 | | |
1079 | 1119 | | |
1080 | | - | |
| 1120 | + | |
1081 | 1121 | | |
1082 | 1122 | | |
1083 | | - | |
| 1123 | + | |
| 1124 | + | |
1084 | 1125 | | |
1085 | 1126 | | |
1086 | 1127 | | |
| |||
1097 | 1138 | | |
1098 | 1139 | | |
1099 | 1140 | | |
1100 | | - | |
1101 | | - | |
1102 | | - | |
1103 | | - | |
1104 | | - | |
1105 | | - | |
1106 | | - | |
1107 | | - | |
| 1141 | + | |
| 1142 | + | |
| 1143 | + | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
1108 | 1151 | | |
1109 | | - | |
1110 | | - | |
1111 | | - | |
1112 | | - | |
1113 | 1152 | | |
| 1153 | + | |
| 1154 | + | |
| 1155 | + | |
1114 | 1156 | | |
1115 | 1157 | | |
1116 | 1158 | | |
| |||
0 commit comments