lock.c (2b1333b80885b896807ffb6ccf4bc21d29aa65e0) | lock.c (5d92a30e900dc97221e36f09ae740457d560d281) |
---|---|
1// SPDX-License-Identifier: GPL-2.0-only 2/****************************************************************************** 3******************************************************************************* 4** 5** Copyright (C) 2005-2010 Red Hat, Inc. All rights reserved. 6** 7** 8******************************************************************************* --- 3458 unchanged lines hidden (view full) --- 3467 if (convert) 3468 error = find_lkb(ls, lksb->sb_lkid, &lkb); 3469 else 3470 error = create_lkb(ls, &lkb); 3471 3472 if (error) 3473 goto out; 3474 | 1// SPDX-License-Identifier: GPL-2.0-only 2/****************************************************************************** 3******************************************************************************* 4** 5** Copyright (C) 2005-2010 Red Hat, Inc. All rights reserved. 6** 7** 8******************************************************************************* --- 3458 unchanged lines hidden (view full) --- 3467 if (convert) 3468 error = find_lkb(ls, lksb->sb_lkid, &lkb); 3469 else 3470 error = create_lkb(ls, &lkb); 3471 3472 if (error) 3473 goto out; 3474 |
3475 trace_dlm_lock_start(ls, lkb, mode, flags); | 3475 trace_dlm_lock_start(ls, lkb, name, namelen, mode, flags); |
3476 3477 error = set_lock_args(mode, lksb, flags, namelen, 0, ast, 3478 astarg, bast, &args); 3479 if (error) 3480 goto out_put; 3481 3482 if (convert) 3483 error = convert_lock(ls, lkb, &args); 3484 else 3485 error = request_lock(ls, lkb, name, namelen, &args); 3486 3487 if (error == -EINPROGRESS) 3488 error = 0; 3489 out_put: | 3476 3477 error = set_lock_args(mode, lksb, flags, namelen, 0, ast, 3478 astarg, bast, &args); 3479 if (error) 3480 goto out_put; 3481 3482 if (convert) 3483 error = convert_lock(ls, lkb, &args); 3484 else 3485 error = request_lock(ls, lkb, name, namelen, &args); 3486 3487 if (error == -EINPROGRESS) 3488 error = 0; 3489 out_put: |
3490 trace_dlm_lock_end(ls, lkb, mode, flags, error); | 3490 trace_dlm_lock_end(ls, lkb, name, namelen, mode, flags, error); |
3491 3492 if (convert || error) 3493 __put_lkb(ls, lkb); 3494 if (error == -EAGAIN || error == -EDEADLK) 3495 error = 0; 3496 out: 3497 dlm_unlock_recovery(ls); 3498 dlm_put_lockspace(ls); --- 2938 unchanged lines hidden --- | 3491 3492 if (convert || error) 3493 __put_lkb(ls, lkb); 3494 if (error == -EAGAIN || error == -EDEADLK) 3495 error = 0; 3496 out: 3497 dlm_unlock_recovery(ls); 3498 dlm_put_lockspace(ls); --- 2938 unchanged lines hidden --- |