Whamcloud - gitweb
LU-13717 llite: fix crypto patch merge errors
authorAndreas Dilger <adilger@whamcloud.com>
Mon, 21 Mar 2022 21:19:17 +0000 (15:19 -0600)
committerAndreas Dilger <adilger@whamcloud.com>
Tue, 22 Mar 2022 03:05:15 +0000 (03:05 +0000)
commit896c2a78bf1ed6fbb1d5ee86ee4af55a71171537
tree87bd9652876736a1b8f06e107f67fb69780871bb
parentd99b95617c1ec6d20c59d0780bd47f5babd0b213
LU-13717 llite: fix crypto patch merge errors

Due to delayed landing of crypto patches, there was a semantic
conflict with another patch that changed the ll_getattr()
function prototype code but did not block the patch from landing.

Test-Parameters: trivial testlist=sanity-sec
Fixes: 3256c354a6 ("LU-13717 sec: filename encryption - symlink support")
Fixes: afec2fef71 ("LU-13717 sec: filename encryption")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ia07d6e60f1840889a371538ce5414315e65f6e11
Reviewed-on: https://review.whamcloud.com/46877
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
lustre/llite/symlink.c
lustre/mdd/mdd_dir.c