Page MenuHomeFreeBSD
Differential D24749

Deduplicate fsid comparisons
ClosedPublic
Actions

Authored by freqlabs on May 7 2020, 4:46 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 10:17 AM
Unknown Object (File)
Tue, Apr 8, 1:08 PM
Unknown Object (File)
Sat, Mar 15, 1:05 AM
Unknown Object (File)
Mar 12 2025, 11:59 PM
Unknown Object (File)
Mar 2 2025, 12:08 AM
Unknown Object (File)
Feb 17 2025, 9:27 PM
Unknown Object (File)
Feb 17 2025, 9:19 PM
Unknown Object (File)
Feb 11 2025, 9:28 PM
View All 90 Files
Subscribers
imp
mav
Contributor Reviews (src)

Details

Reviewers
rmacklem
trasz
mjg
Commits
rS361589: MFC r361313:
rS361313: Deduplicate fsid comparisons
Summary

Comparing fsid_t objects requires internal knowledge of the fsid structure and yet this is duplicated across a number of places in the code.

Simplify by creating a fsidcmp function.

Sponsored by: iXsystems, Inc.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

freqlabs created this revision.May 7 2020, 4:46 PM
Herald added subscribers: Contributor Reviews (src), imp. · View Herald TranscriptMay 7 2020, 4:46 PM
freqlabs requested review of this revision.May 7 2020, 4:46 PM
freqlabs updated this revision to Diff 71521.May 7 2020, 10:01 PM
freqlabs edited the summary of this revision. (Show Details)
freqlabs added reviewers: rmacklem, trasz, mjg.
freqlabs added a subscriber: mav.
mjg added inline comments.May 7 2020, 11:07 PM
sys/sys/mount.h
59

I think it would be cleaner to just to turn this into an actual function.

59

.. it can land in vfs_subr.c

freqlabs added inline comments.May 8 2020, 2:50 PM
sys/sys/mount.h
59

I'll have to get it into userland somewhere, too.

freqlabs marked an inline comment as not done.May 8 2020, 2:52 PM
mjg added inline comments.May 9 2020, 9:16 PM
sys/sys/mount.h
59

Oh, my bad. In that case just turn in into a macro. We can survive without type checking for this one but it can still be added "by hand". Then it can just "memcmp and the comment can be removed.

freqlabs updated this revision to Diff 71620.May 10 2020, 6:35 PM

Make fsidcmp a macro

freqlabs marked an inline comment as done.May 10 2020, 6:36 PM
mjg accepted this revision.May 10 2020, 8:19 PM
This revision is now accepted and ready to land.May 10 2020, 8:19 PM
freqlabs marked 2 inline comments as done.May 14 2020, 11:59 AM
Closed by commit rS361313: Deduplicate fsid comparisons (authored by freqlabs). · Explain WhyMay 21 2020, 1:56 AM
This revision was automatically updated to reflect the committed changes.
freqlabs added a commit: rS361313: Deduplicate fsid comparisons.
freqlabs added a commit: rS361589: MFC r361313:.May 28 2020, 5:09 PM

Revision Contents
Changeset List

PathSize
lib/
libugidfw/
5 lines
sbin/
mksnap_ffs/
3 lines
umount/
3 lines
sys/
fs/
nfs/
3 lines
nfsserver/
22 lines
8 lines
15 lines
kern/
13 lines
security/
mac_bsdextended/
2 lines
sys/
2 lines
usr.sbin/
autofs/
3 lines
mountd/
15 lines

Diff 71620

View Options

lib/libugidfw/ugidfw.c

Show First 20 Lines • Show All 232 Lines • ▼ Show 20 Linesstruct ciss_softc
struct mtx ciss_mtx; struct mtx ciss_mtx;
struct ciss_ldrive **ciss_logical; struct ciss_ldrive **ciss_logical;
struct ciss_pdrive **ciss_physical; struct ciss_pdrive **ciss_physical;
union ciss_device_address *ciss_controllers; /* controller address */ union ciss_device_address *ciss_controllers; /* controller address */
int ciss_max_bus_number; /* maximum bus number */ int ciss_max_bus_number; /* maximum bus number */
int ciss_max_logical_bus; int ciss_max_logical_bus;
int ciss_max_physical_bus; int ciss_max_physical_bus;
int ciss_max_physical_target; /* highest physical target number */
kevansUnsubmitted
Done
Inline Actions

The name should be tabbed over, rather than spaced over, to match the lines above it.

kevans: The name should be tabbed over, rather than spaced over, to match the lines above it.
struct cam_devq *ciss_cam_devq; struct cam_devq *ciss_cam_devq;
struct cam_sim **ciss_cam_sim; struct cam_sim **ciss_cam_sim;
int ciss_soft_reset; int ciss_soft_reset;
int ciss_flags; int ciss_flags;
#define CISS_FLAG_NOTIFY_OK (1<<0) /* notify command running OK */ #define CISS_FLAG_NOTIFY_OK (1<<0) /* notify command running OK */
▲ Show 20 Lines • Show All 144 Lines • Show Last 20 Lines
View Options

sbin/mksnap_ffs/mksnap_ffs.c

Show First 20 Lines • Show All 232 Lines • ▼ Show 20 Linesstruct ciss_softc
struct mtx ciss_mtx; struct mtx ciss_mtx;
struct ciss_ldrive **ciss_logical; struct ciss_ldrive **ciss_logical;
struct ciss_pdrive **ciss_physical; struct ciss_pdrive **ciss_physical;
union ciss_device_address *ciss_controllers; /* controller address */ union ciss_device_address *ciss_controllers; /* controller address */
int ciss_max_bus_number; /* maximum bus number */ int ciss_max_bus_number; /* maximum bus number */
int ciss_max_logical_bus; int ciss_max_logical_bus;
int ciss_max_physical_bus; int ciss_max_physical_bus;
int ciss_max_physical_target; /* highest physical target number */
kevansUnsubmitted
Done
Inline Actions

The name should be tabbed over, rather than spaced over, to match the lines above it.

kevans: The name should be tabbed over, rather than spaced over, to match the lines above it.
struct cam_devq *ciss_cam_devq; struct cam_devq *ciss_cam_devq;
struct cam_sim **ciss_cam_sim; struct cam_sim **ciss_cam_sim;
int ciss_soft_reset; int ciss_soft_reset;
int ciss_flags; int ciss_flags;
#define CISS_FLAG_NOTIFY_OK (1<<0) /* notify command running OK */ #define CISS_FLAG_NOTIFY_OK (1<<0) /* notify command running OK */
▲ Show 20 Lines • Show All 144 Lines • Show Last 20 Lines
View Options

sbin/umount/umount.c

Show First 20 Lines • Show All 232 Lines • ▼ Show 20 Linesstruct ciss_softc
struct mtx ciss_mtx; struct mtx ciss_mtx;
struct ciss_ldrive **ciss_logical; struct ciss_ldrive **ciss_logical;
struct ciss_pdrive **ciss_physical; struct ciss_pdrive **ciss_physical;
union ciss_device_address *ciss_controllers; /* controller address */ union ciss_device_address *ciss_controllers; /* controller address */
int ciss_max_bus_number; /* maximum bus number */ int ciss_max_bus_number; /* maximum bus number */
int ciss_max_logical_bus; int ciss_max_logical_bus;
int ciss_max_physical_bus; int ciss_max_physical_bus;
int ciss_max_physical_target; /* highest physical target number */
kevansUnsubmitted
Done
Inline Actions

The name should be tabbed over, rather than spaced over, to match the lines above it.

kevans: The name should be tabbed over, rather than spaced over, to match the lines above it.
struct cam_devq *ciss_cam_devq; struct cam_devq *ciss_cam_devq;
struct cam_sim **ciss_cam_sim; struct cam_sim **ciss_cam_sim;
int ciss_soft_reset; int ciss_soft_reset;
int ciss_flags; int ciss_flags;
#define CISS_FLAG_NOTIFY_OK (1<<0) /* notify command running OK */ #define CISS_FLAG_NOTIFY_OK (1<<0) /* notify command running OK */
▲ Show 20 Lines • Show All 144 Lines • Show Last 20 Lines
View Options

sys/fs/nfs/nfsdport.h

Show First 20 Lines • Show All 232 Lines • ▼ Show 20 Linesstruct ciss_softc
struct mtx ciss_mtx; struct mtx ciss_mtx;
struct ciss_ldrive **ciss_logical; struct ciss_ldrive **ciss_logical;
struct ciss_pdrive **ciss_physical; struct ciss_pdrive **ciss_physical;
union ciss_device_address *ciss_controllers; /* controller address */ union ciss_device_address *ciss_controllers; /* controller address */
int ciss_max_bus_number; /* maximum bus number */ int ciss_max_bus_number; /* maximum bus number */
int ciss_max_logical_bus; int ciss_max_logical_bus;
int ciss_max_physical_bus; int ciss_max_physical_bus;
int ciss_max_physical_target; /* highest physical target number */
kevansUnsubmitted
Done
Inline Actions

The name should be tabbed over, rather than spaced over, to match the lines above it.

kevans: The name should be tabbed over, rather than spaced over, to match the lines above it.
struct cam_devq *ciss_cam_devq; struct cam_devq *ciss_cam_devq;
struct cam_sim **ciss_cam_sim; struct cam_sim **ciss_cam_sim;
int ciss_soft_reset; int ciss_soft_reset;
int ciss_flags; int ciss_flags;
#define CISS_FLAG_NOTIFY_OK (1<<0) /* notify command running OK */ #define CISS_FLAG_NOTIFY_OK (1<<0) /* notify command running OK */
▲ Show 20 Lines • Show All 144 Lines • Show Last 20 Lines
View Options

sys/fs/nfsserver/nfs_nfsdport.c

Loading...
View Options

sys/fs/nfsserver/nfs_nfsdsocket.c

Loading...
View Options

sys/fs/nfsserver/nfs_nfsdstate.c

Loading...
View Options

sys/kern/vfs_subr.c

Loading...
View Options

sys/security/mac_bsdextended/mac_bsdextended.h

Loading...
View Options

sys/sys/mount.h

Loading...
View Options

usr.sbin/autofs/autounmountd.c

Loading...
View Options

usr.sbin/mountd/mountd.c

Loading...