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

UFS2: make di_extsize unsigned.

Browse Source 
di_extsize is the EA size and as such it should be unsigned.
Adjust related types for consistency.

Reviewed by:	mckusick (previous version)
MFC after:	3 weeks
This commit is contained in:
Pedro F. Giffuni 2013-10-24 00:33:29 +00:00
parent b5331f4d88
commit 4b367145f7
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/fsck_ffs/ea.c
View File

@ -65,7 +65,7 @@ eascan(struct inodesc *idesc, struct ufs2_dinode *dp)
char dbuf[DIRBLKSIZ]; char dbuf[DIRBLKSIZ];
printf("Inode %ju extsize %ju\n", printf("Inode %ju extsize %ju\n",
(intmax_t)idesc->id_number, (intmax_t)dp->di_extsize); (intmax_t)idesc->id_number, (uintmax_t)dp->di_extsize);
if (dp->di_extsize == 0) if (dp->di_extsize == 0)
return 0; return 0;
if (dp->di_extsize <= sblock.fs_fsize) if (dp->di_extsize <= sblock.fs_fsize)

2
sbin/growfs/debug.c
View File

@ -765,7 +765,7 @@ dbg_dump_ufs2_ino(struct fs *sb, const char *comment, struct ufs2_dinode *ino)
fprintf(dbg_log, "gen int32_t 0x%08x\n", ino->di_gen); fprintf(dbg_log, "gen int32_t 0x%08x\n", ino->di_gen);
fprintf(dbg_log, "kernflags u_int32_t 0x%08x\n", ino->di_kernflags); fprintf(dbg_log, "kernflags u_int32_t 0x%08x\n", ino->di_kernflags);
fprintf(dbg_log, "flags u_int32_t 0x%08x\n", ino->di_flags); fprintf(dbg_log, "flags u_int32_t 0x%08x\n", ino->di_flags);
fprintf(dbg_log, "extsize int32_t 0x%08x\n", ino->di_extsize); fprintf(dbg_log, "extsize u_int32_t 0x%08x\n", ino->di_extsize);
/* XXX: What do we do with di_extb[NXADDR]? */ /* XXX: What do we do with di_extb[NXADDR]? */

2
sys/fs/ext2fs/ext2_vnops.c
View File

@ -1689,7 +1689,7 @@ ext2_ind_read(struct vop_read_args *ap)
NOCRED, blkoffset + uio->uio_resid, seqcount, NOCRED, blkoffset + uio->uio_resid, seqcount,
0, &bp); 0, &bp);
} else if (seqcount > 1) { } else if (seqcount > 1) {
int nextsize = blksize(fs, ip, nextlbn); u_int nextsize = blksize(fs, ip, nextlbn);
error = breadn(vp, lbn, error = breadn(vp, lbn,
size, &nextlbn, &nextsize, 1, NOCRED, &bp); size, &nextlbn, &nextsize, 1, NOCRED, &bp);
} else } else

7
sys/ufs/ffs/ffs_vnops.c
View File

@ -531,7 +531,7 @@ ffs_read(ap)
* arguments point to arrays of the size specified in * arguments point to arrays of the size specified in
* the 6th argument. * the 6th argument.
*/ */
int nextsize = blksize(fs, ip, nextlbn); u_int nextsize = blksize(fs, ip, nextlbn);
error = breadn_flags(vp, lbn, size, &nextlbn, error = breadn_flags(vp, lbn, size, &nextlbn,
&nextsize, 1, NOCRED, GB_UNMAPPED, &bp); &nextsize, 1, NOCRED, GB_UNMAPPED, &bp);
} else { } else {
@ -956,7 +956,7 @@ ffs_extread(struct vnode *vp, struct uio *uio, int ioflag)
* arguments point to arrays of the size specified in * arguments point to arrays of the size specified in
* the 6th argument. * the 6th argument.
*/ */
int nextsize = sblksize(fs, dp->di_extsize, nextlbn); u_int nextsize = sblksize(fs, dp->di_extsize, nextlbn);
nextlbn = -1 - nextlbn; nextlbn = -1 - nextlbn;
error = breadn(vp, -1 - lbn, error = breadn(vp, -1 - lbn,
@ -1218,7 +1218,8 @@ ffs_rdextattr(u_char **p, struct vnode *vp, struct thread *td, int extra)
struct fs *fs; struct fs *fs;
struct uio luio; struct uio luio;
struct iovec liovec; struct iovec liovec;
int easize, error; u_int easize;
int error;
u_char *eae; u_char *eae;
ip = VTOI(vp); ip = VTOI(vp);

2
sys/ufs/ufs/dinode.h
View File

@ -141,7 +141,7 @@ struct ufs2_dinode {
u_int32_t di_gen; /* 80: Generation number. */ u_int32_t di_gen; /* 80: Generation number. */
u_int32_t di_kernflags; /* 84: Kernel flags. */ u_int32_t di_kernflags; /* 84: Kernel flags. */
u_int32_t di_flags; /* 88: Status flags (chflags). */ u_int32_t di_flags; /* 88: Status flags (chflags). */
int32_t di_extsize; /* 92: External attributes block. */ u_int32_t di_extsize; /* 92: External attributes size. */
ufs2_daddr_t di_extb[NXADDR];/* 96: External attributes block. */ ufs2_daddr_t di_extb[NXADDR];/* 96: External attributes block. */
ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */ ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */
ufs2_daddr_t di_ib[NIADDR]; /* 208: Indirect disk blocks. */ ufs2_daddr_t di_ib[NIADDR]; /* 208: Indirect disk blocks. */