Page MenuHomeFreeBSD
Differential D15308

Change option dry-run from 'n' to 'C'.
ClosedPublic
Actions

Authored by oshogbo on May 5 2018, 2:26 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 13, 6:42 PM
Unknown Object (File)
Feb 22 2025, 2:07 PM
Unknown Object (File)
Feb 21 2025, 8:08 PM
Unknown Object (File)
Feb 21 2025, 8:00 PM
Unknown Object (File)
Feb 20 2025, 10:12 PM
Unknown Object (File)
Feb 18 2025, 10:07 AM
Unknown Object (File)
Jan 18 2025, 9:53 AM
Unknown Object (File)
Jan 17 2025, 8:33 PM
View All 63 Files
Subscribers
imp

Details

Reviewers
allanjude
cem
Group Reviewers
manpages
Commits
rS333438: Change option dry-run from 'n' to 'C' in geli attach command.
Summary

'n' is used in other commands to define the key index.
We should be consistent with that.
'C' option is used by patch(1) to perform dryrun.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

oshogbo created this revision.May 5 2018, 2:26 PM
allanjude accepted this revision.May 5 2018, 3:36 PM

C for check, makes sense to me since n is used in a different context already.

This revision is now accepted and ready to land.May 5 2018, 3:36 PM
Closed by commit rS333438: Change option dry-run from 'n' to 'C' in geli attach command. (authored by oshogbo). · Explain WhyMay 9 2018, 8:51 PM
This revision was automatically updated to reflect the committed changes.
Herald added a reviewer: manpages. · View Herald TranscriptMay 9 2018, 8:51 PM
Herald added a subscriber: imp. · View Herald Transcript

Revision Contents
Changeset List

PathSize
sbin/
geom/
class/
eli/
10 lines
6 lines

Diff 42169

View Options

sbin/geom/class/eli/geli.8

Show First 20 Lines • Show All 2,514 Lines • ▼ Show 20 Lines
do_lock_pp(struct thread *td, struct umutex *m, uint32_t flags, do_lock_pp(struct thread *td, struct umutex *m, uint32_t flags,
struct _umtx_time *timeout, int try) struct _umtx_time *timeout, int try)
{ {
struct umtx_abs_timeout timo; struct umtx_abs_timeout timo;
struct umtx_q *uq, *uq2; struct umtx_q *uq, *uq2;
struct umtx_pi *pi; struct umtx_pi *pi;
uint32_t ceiling; uint32_t ceiling;
uint32_t owner, id; uint32_t owner, id;
int error, pri, old_inherited_pri, su, rv; int error, pri, old_inherited_pri, new_pri, rv;
bool su;
id = td->td_tid; id = td->td_tid;
uq = td->td_umtxq; uq = td->td_umtxq;
if ((error = umtx_key_get(m, (flags & UMUTEX_ROBUST) != 0 ? if ((error = umtx_key_get(m, (flags & UMUTEX_ROBUST) != 0 ?
TYPE_PP_ROBUST_UMUTEX : TYPE_PP_UMUTEX, GET_SHARE(flags), TYPE_PP_ROBUST_UMUTEX : TYPE_PP_UMUTEX, GET_SHARE(flags),
&uq->uq_key)) != 0) &uq->uq_key)) != 0)
return (error); return (error);
Show All 12 Lines if (rv == -1) {
error = EFAULT; error = EFAULT;
goto out; goto out;
} }
ceiling = RTP_PRIO_MAX - ceiling; ceiling = RTP_PRIO_MAX - ceiling;
if (ceiling > RTP_PRIO_MAX) { if (ceiling > RTP_PRIO_MAX) {
error = EINVAL; error = EINVAL;
goto out; goto out;
} }
new_pri = PRI_MIN_REALTIME + ceiling;
mtx_lock(&umtx_lock); if (td->td_base_user_pri < new_pri) {
if (td->td_base_user_pri < PRI_MIN_REALTIME + ceiling) {
mtx_unlock(&umtx_lock);
error = EINVAL; error = EINVAL;
goto out; goto out;
} }
if (su && PRI_MIN_REALTIME + ceiling < uq->uq_inherited_pri) { if (su) {
uq->uq_inherited_pri = PRI_MIN_REALTIME + ceiling; mtx_lock(&umtx_lock);
if (new_pri < uq->uq_inherited_pri) {
uq->uq_inherited_pri = new_pri;
thread_lock(td); thread_lock(td);
if (uq->uq_inherited_pri < UPRI(td)) if (new_pri < UPRI(td))
sched_lend_user_prio(td, uq->uq_inherited_pri); sched_lend_user_prio(td, new_pri);
thread_unlock(td); thread_unlock(td);
} }
mtx_unlock(&umtx_lock); mtx_unlock(&umtx_lock);
}
rv = casueword32(&m->m_owner, UMUTEX_CONTESTED, &owner, rv = casueword32(&m->m_owner, UMUTEX_CONTESTED, &owner,
id | UMUTEX_CONTESTED); id | UMUTEX_CONTESTED);
/* The address was invalid. */ /* The address was invalid. */
if (rv == -1) { if (rv == -1) {
error = EFAULT; error = EFAULT;
break; break;
} }
▲ Show 20 Lines • Show All 2,624 Lines • Show Last 20 Lines
View Options

sbin/geom/class/eli/geom_eli.c

Show First 20 Lines • Show All 2,514 Lines • ▼ Show 20 Lines
do_lock_pp(struct thread *td, struct umutex *m, uint32_t flags, do_lock_pp(struct thread *td, struct umutex *m, uint32_t flags,
struct _umtx_time *timeout, int try) struct _umtx_time *timeout, int try)
{ {
struct umtx_abs_timeout timo; struct umtx_abs_timeout timo;
struct umtx_q *uq, *uq2; struct umtx_q *uq, *uq2;
struct umtx_pi *pi; struct umtx_pi *pi;
uint32_t ceiling; uint32_t ceiling;
uint32_t owner, id; uint32_t owner, id;
int error, pri, old_inherited_pri, su, rv; int error, pri, old_inherited_pri, new_pri, rv;
bool su;
id = td->td_tid; id = td->td_tid;
uq = td->td_umtxq; uq = td->td_umtxq;
if ((error = umtx_key_get(m, (flags & UMUTEX_ROBUST) != 0 ? if ((error = umtx_key_get(m, (flags & UMUTEX_ROBUST) != 0 ?
TYPE_PP_ROBUST_UMUTEX : TYPE_PP_UMUTEX, GET_SHARE(flags), TYPE_PP_ROBUST_UMUTEX : TYPE_PP_UMUTEX, GET_SHARE(flags),
&uq->uq_key)) != 0) &uq->uq_key)) != 0)
return (error); return (error);
Show All 12 Lines if (rv == -1) {
error = EFAULT; error = EFAULT;
goto out; goto out;
} }
ceiling = RTP_PRIO_MAX - ceiling; ceiling = RTP_PRIO_MAX - ceiling;
if (ceiling > RTP_PRIO_MAX) { if (ceiling > RTP_PRIO_MAX) {
error = EINVAL; error = EINVAL;
goto out; goto out;
} }
new_pri = PRI_MIN_REALTIME + ceiling;
mtx_lock(&umtx_lock); if (td->td_base_user_pri < new_pri) {
if (td->td_base_user_pri < PRI_MIN_REALTIME + ceiling) {
mtx_unlock(&umtx_lock);
error = EINVAL; error = EINVAL;
goto out; goto out;
} }
if (su && PRI_MIN_REALTIME + ceiling < uq->uq_inherited_pri) { if (su) {
uq->uq_inherited_pri = PRI_MIN_REALTIME + ceiling; mtx_lock(&umtx_lock);
if (new_pri < uq->uq_inherited_pri) {
uq->uq_inherited_pri = new_pri;
thread_lock(td); thread_lock(td);
if (uq->uq_inherited_pri < UPRI(td)) if (new_pri < UPRI(td))
sched_lend_user_prio(td, uq->uq_inherited_pri); sched_lend_user_prio(td, new_pri);
thread_unlock(td); thread_unlock(td);
} }
mtx_unlock(&umtx_lock); mtx_unlock(&umtx_lock);
}
rv = casueword32(&m->m_owner, UMUTEX_CONTESTED, &owner, rv = casueword32(&m->m_owner, UMUTEX_CONTESTED, &owner,
id | UMUTEX_CONTESTED); id | UMUTEX_CONTESTED);
/* The address was invalid. */ /* The address was invalid. */
if (rv == -1) { if (rv == -1) {
error = EFAULT; error = EFAULT;
break; break;
} }
▲ Show 20 Lines • Show All 2,624 Lines • Show Last 20 Lines