Page MenuHomeFreeBSD
Differential D10803

makefs: make buf generic
ClosedPublic
Actions

Authored by guest-svmhdvn on May 18 2017, 5:38 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Dec 8, 4:01 AM
Unknown Object (File)
Mon, Nov 25, 1:11 AM
Unknown Object (File)
Sat, Nov 23, 7:54 AM
Unknown Object (File)
Sat, Nov 23, 2:47 AM
Unknown Object (File)
Thu, Nov 21, 5:09 PM
Unknown Object (File)
Nov 19 2024, 10:25 AM
Unknown Object (File)
Nov 19 2024, 3:28 AM
Unknown Object (File)
Nov 6 2024, 9:30 PM
View All 96 Files
Subscribers
None

Details

Reviewers
emaste
ngie
Commits
rS318902: makefs: make buf generic
Summary

Initial changes submitted by emaste, bug fixes added by smahadevan

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

guest-svmhdvn created this revision.May 18 2017, 5:38 PM
guest-svmhdvn added a parent revision: D10802: makefs: style fixes and whitespace changes.
ngie requested changes to this revision.May 18 2017, 5:47 PM

This was already committed, and the sectorsize portion of the change broke makefs.

This revision now requires changes to proceed.May 18 2017, 5:47 PM
guest-svmhdvn added a child revision: D10780: makefs: add -O (offset) option.May 18 2017, 6:01 PM
guest-svmhdvn added a comment.EditedMay 18 2017, 6:08 PM

You are referring to https://svnweb.freebsd.org/base?view=revision&revision=317967 right? Was the breaking error something like: "makefs: bread: lseek 48 (-4393751551952): Invalid argument"? My bug fixes in this diff should fix the previously breaking revision. Specifically, the problem had to do with incorrectly casting a void * field in the vnode struct as fsinfo_t. Instead, this diff adds the v_fsinfo field to the struct vnode.

emaste edited edge metadata.May 18 2017, 6:53 PM

Specifically, the makefs tests pass with this fixed version of the previously-reverted change.

emaste added inline comments.May 18 2017, 7:06 PM
usr.sbin/makefs/ffs/ufs_inode.h
48 ↗(On Diff #28526)

Ought to be named i_devvp for consistency with NetBSD's version.

guest-svmhdvn updated this revision to Diff 28540.May 18 2017, 9:54 PM
guest-svmhdvn edited edge metadata.

Changed i_vnode to i_devvp to maintain consistency with NetBSD

guest-svmhdvn mentioned this in D10802: makefs: style fixes and whitespace changes.May 19 2017, 7:34 PM
emaste added a comment.May 24 2017, 12:21 AM

One more minor divergence from NetBSD noted inline. I suggest we go ahead with this change, and revisit the whitespace later on.

usr.sbin/makefs/ffs/buf.h
60 ↗(On Diff #28540)

Should call this b_fs to match NetBSD

guest-svmhdvn updated this revision to Diff 28778.May 25 2017, 1:34 PM

Renamed buf and vnode fields to match NetBSD

guest-svmhdvn removed a parent revision: D10802: makefs: style fixes and whitespace changes.May 25 2017, 2:13 PM
emaste added a comment.May 25 2017, 2:47 PM

What's this diff relative to? It looks like e.g ffs/buf.c does not correspond to what is currently SVN master.

guest-svmhdvn added a comment.May 25 2017, 3:01 PM

Ah you're right, I think I must have included a few extra commits in the diff, I'll fix this diff and make it relative to master.

guest-svmhdvn updated this revision to Diff 28814.May 25 2017, 8:17 PM
emaste accepted this revision.May 25 2017, 9:38 PM
Closed by commit rS318902: makefs: make buf generic (authored by emaste). · Explain WhyMay 25 2017, 9:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
usr.sbin/
makefs/
10 lines
ffs/
8 lines
17 lines
6 lines
44 lines
2 lines

Diff 28819

View Options

head/usr.sbin/makefs/ffs.c

Loading...
View Options

head/usr.sbin/makefs/ffs/buf.h

Loading...
View Options

head/usr.sbin/makefs/ffs/buf.c

Loading...
View Options

head/usr.sbin/makefs/ffs/ffs_alloc.c

Loading...
View Options

head/usr.sbin/makefs/ffs/ffs_balloc.c

Loading...
View Options

head/usr.sbin/makefs/ffs/ufs_inode.h

Loading...