Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wip filelock deadlock #7713

Merged
merged 2 commits into from Mar 15, 2016
Merged

Conversation

ukernel
Copy link
Contributor

@ukernel ukernel commented Feb 19, 2016

No description provided.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
@ukernel ukernel added feature cephfs Ceph File System labels Feb 19, 2016
Signed-off-by: Yan, Zheng <zyan@redhat.com>
@ukernel
Copy link
Contributor Author

ukernel commented Mar 3, 2016

@gregsfortytwo
Copy link
Member

@jcsp, please review

return l.client > r.client ? 1 : -1;
if (l.owner != r.owner)
return l.owner > r.owner ? 1 : -1;
if (l.owner & (1ULL << 63))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to have a descriptive-named #define for this 1<<63 mask

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or just copy the comment from ceph_filelock_owner_equal up above; it confused the heck out of me until I looked at the full file and saw that. :)

@jcsp
Copy link
Contributor

jcsp commented Mar 11, 2016

This looks sane to me, I'm inclined to merge once tests are run, I've included this on just-pushed-to-gitbuilders wip-jcsp-testing branch

gregsfortytwo added a commit that referenced this pull request Mar 14, 2016
… into greg-fs-testing

#7713

Reviewed-by: John Spray <john.spray@redhat.com>
@jcsp
Copy link
Contributor

jcsp commented Mar 14, 2016

Reviewed-by

@gregsfortytwo
Copy link
Member

sounds good, it's passed through my branch as well

gregsfortytwo added a commit that referenced this pull request Mar 15, 2016
Wip filelock deadlock

Reviewed-by: John Spray <john.spray@redhat.com>
@gregsfortytwo gregsfortytwo merged commit fcce59e into ceph:master Mar 15, 2016
@ukernel ukernel deleted the wip-filelock-deadlock branch June 14, 2016 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants