Page MenuHomeFreeBSD
Differential D25263 Diff 73090 sys/fs/nfs/nfs_commonsubs.c

Changeset View

Standalone View

View Options

sys/fs/nfs/nfs_commonsubs.c

Show First 20 Lines • Show All 1,396 Lines • ▼ Show 20 Lines for (bitpos = 0; bitpos < NFSATTRBIT_MAX; bitpos++) {
case NFSATTRBIT_FSID: case NFSATTRBIT_FSID:
NFSM_DISSECT(tl, u_int32_t *, 4 * NFSX_UNSIGNED); NFSM_DISSECT(tl, u_int32_t *, 4 * NFSX_UNSIGNED);
thyp = fxdr_hyper(tl); thyp = fxdr_hyper(tl);
tl += 2; tl += 2;
thyp2 = fxdr_hyper(tl); thyp2 = fxdr_hyper(tl);
if (compare) { if (compare) {
if (*retcmpp == 0) { if (*retcmpp == 0) {
if (thyp != (u_int64_t) if (thyp != (u_int64_t)
vfs_statfs(vnode_mount(vp))->f_fsid.val[0] || (&(vnode_mount(vp)->mnt_stat))->f_fsid.val[0] ||
rmacklemUnsubmitted
Done
Inline Actions

It might read better as

vp->v_mount->mnt_stat.f_fsid.val[0] ||

instead of taking the address of and then
using it as a pointer.
(Same below.)

rmacklem: It might read better as vp->v_mount->mnt_stat.f_fsid.val[0] || instead of taking the…
thyp2 != (u_int64_t) thyp2 != (u_int64_t)
rmacklemUnsubmitted
Done
Inline Actions

You could take this a step further and replace
vnode_mount(vp) with vp->v_mount. For example, "vfs_statfs(vnode_mount(vp))->"
can be replaced with "vp->v_mount->mnt_stat.".

Both vfs_statfs() and vnode_mount() were Mac OS/X's way of doing things via
accessor functions and the macros in nfskpiport.h were meant to make the
Mac OS/X code work in FreeBSD.

Since the Mac OS/X port is ancient history, I have planned on eventually
getting rid of all of the macros in nfskpiport.h by doing the replacement
manually. Someday I'll do this for "vnode_t", but it is painful, because after
you do a global substitution, there are a lot of wrapped lines that need to be
fixed, etc. (I did do some of them recently, but haven't gotten around to the rest.

rmacklem: You could take this a step further and replace vnode_mount(vp) with vp->v_mount. For example…
vfs_statfs(vnode_mount(vp))->f_fsid.val[1]) (&(vnode_mount(vp)->mnt_stat))->f_fsid.val[1])
*retcmpp = NFSERR_NOTSAME; *retcmpp = NFSERR_NOTSAME;
} }
} else if (nap != NULL) { } else if (nap != NULL) {
nap->na_filesid[0] = thyp; nap->na_filesid[0] = thyp;
nap->na_filesid[1] = thyp2; nap->na_filesid[1] = thyp2;
} }
attrsum += (4 * NFSX_UNSIGNED); attrsum += (4 * NFSX_UNSIGNED);
break; break;
▲ Show 20 Lines • Show All 3,376 Lines • Show Last 20 Lines