cephfs: upgrade fscrypt version to fix concurrency issue (backport #4609)

NymanRobin commented 1 month ago

Mergify bot could not resolve a conflict in #4612 when cherry-picking the commit from #4609 So here is cherry-pick manually

Madhu-1 commented 1 month ago

@NymanRobin can you use git cherry-pick which helps us to keep track of the changes?

NymanRobin commented 1 month ago

Sure @Madhu-1, I think now it should be cherry-picked properly :D First time just upgraded fscrypt manually to avoid having to solve conflicts, but let's do it the right way :+1:

Madhu-1 commented 1 month ago

Sure @Madhu-1, I think now it should be cherry-picked properly :D First time just upgraded fscrypt manually to avoid having to solve conflicts, but let's do it the right way 👍

@NymanRobin can you use -x to indicate which commit this change was cherry-picked from?

NymanRobin commented 1 month ago

Hopefully third time is the charm :crossed_fingers:

Madhu-1 commented 1 month ago

Hopefully third time is the charm 🤞

yes , this looks good, Thanks for taking care of it!

Madhu-1 commented 1 month ago

@mergifyio queue

mergify[bot] commented 1 month ago

queue

🛑 The pull request has been removed from the queue `default`

The queue conditions cannot be satisfied due to failing checks. You can take a look at `Queue: Embarked in merge queue` check runs for more details. In case of a failure due to a flaky test, you should first retrigger the CI. Then, re-embark the pull request into the merge queue by posting the comment `@mergifyio refresh` on the pull request.