d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert msdosfs MAKEFS #ifdef changes from r319870

Browse Source 
These changes are not needed for current msdosfs makefs WIP.

Submitted by:	Siva Mahadevan
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
emaste 2018-07-24 21:10:17 +00:00
parent 7e2e48958b
commit 13dfd444cc
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/fs/msdosfs/denode.h
View File

@ -211,7 +211,7 @@ struct denode {
((dep)->de_Attributes & ATTR_DIRECTORY) ? 0 : (dep)->de_FileSize), \
putushort((dp)->deHighClust, (dep)->de_StartCluster >> 16))
#if defined(_KERNEL) || defined(MAKEFS)
#ifdef _KERNEL
#define VTODE(vp) ((struct denode *)(vp)->v_data)
#define DETOV(de) ((de)->de_vnode)
@ -281,6 +281,5 @@ int deupdat(struct denode *dep, int waitfor);
int removede(struct denode *pdep, struct denode *dep);
int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred);
int doscheckpath( struct denode *source, struct denode *target);
#endif /* _KERNEL || MAKEFS */
#endif /* _KERNEL */
#endif /* !_FS_MSDOSFS_DENODE_H_ */

4
sys/fs/msdosfs/direntry.h
View File

@ -135,7 +135,7 @@ struct winentry {
#define DD_YEAR_MASK 0xFE00 /* year - 1980 */
#define DD_YEAR_SHIFT 9
#if defined(_KERNEL) || defined(MAKEFS)
#ifdef _KERNEL
struct mbnambuf {
size_t nb_len;
int nb_last_id;
@ -161,5 +161,5 @@ int win2unixfn(struct mbnambuf *nbp, struct winentry *wep, int chksum,
uint8_t winChksum(uint8_t *name);
int winSlotCnt(const u_char *un, size_t unlen, struct msdosfsmount *pmp);
size_t winLenFixup(const u_char *un, size_t unlen);
#endif /* _KERNEL || MAKEFS */
#endif /* _KERNEL */
#endif /* !_FS_MSDOSFS_DIRENTRY_H_ */

4
sys/fs/msdosfs/fat.h
View File

@ -82,7 +82,7 @@
#define MSDOSFSEOF(pmp, cn) ((((cn) | ~(pmp)->pm_fatmask) & CLUST_EOFS) == CLUST_EOFS)
#if defined(_KERNEL) || defined(MAKEFS)
#ifdef _KERNEL
/*
* These are the values for the function argument to the function
* fatentry().
@ -105,5 +105,5 @@ int extendfile(struct denode *dep, u_long count, struct buf **bpp, u_long *ncp,
void fc_purge(struct denode *dep, u_int frcn);
int markvoldirty(struct msdosfsmount *pmp, int dirty);
#endif /* _KERNEL || MAKEFS */
#endif /* _KERNEL */
#endif /* !_FS_MSDOSFS_FAT_H_ */