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

Remove 'low' argument from fd_last_used().

Browse Source 
This function is static and the only caller always passes 0 as low.

While here update note about return values in comment.

Reviewed by:	pjd
Approved by:	trasz (mentor)
MFC after:	1 month
This commit is contained in:
Mateusz Guzik 2012-06-13 17:18:16 +00:00
parent 02efb9a8b1
commit 2ca63f0a90
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=237013
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/kern/kern_descrip.c
View File

@ -119,7 +119,7 @@ static int closefp(struct filedesc *fdp, int fd, struct file *fp,
static int do_dup(struct thread *td, int flags, int old, int new,
register_t *retval);
static int fd_first_free(struct filedesc *, int, int);
static int fd_last_used(struct filedesc *, int, int);
static int fd_last_used(struct filedesc *, int);
static void fdgrowtable(struct filedesc *, int);
static void fdunused(struct filedesc *fdp, int fd);
static void fdused(struct filedesc *fdp, int fd);
@ -217,19 +217,16 @@ fd_first_free(struct filedesc *fdp, int low, int size)
}
/*
* Find the highest non-zero bit in the given bitmap, starting at low and
* not exceeding size - 1.
* Find the highest non-zero bit in the given bitmap, starting at 0 and
* not exceeding size - 1. Return -1 if not found.
*/
static int
fd_last_used(struct filedesc *fdp, int low, int size)
fd_last_used(struct filedesc *fdp, int size)
{
NDSLOTTYPE *map = fdp->fd_map;
NDSLOTTYPE mask;
int off, minoff;
if (low >= size)
return (-1);
off = NDSLOT(size);
if (size % NDENTRIES) {
mask = ~(~(NDSLOTTYPE)0 << (size % NDENTRIES));
@ -237,10 +234,10 @@ fd_last_used(struct filedesc *fdp, int low, int size)
return (off * NDENTRIES + flsl(mask) - 1);
--off;
}
for (minoff = NDSLOT(low); off >= minoff; --off)
for (minoff = NDSLOT(0); off >= minoff; --off)
if (map[off] != 0)
return (off * NDENTRIES + flsl(map[off]) - 1);
return (low - 1);
return (-1);
}
static int
@ -286,7 +283,7 @@ fdunused(struct filedesc *fdp, int fd)
if (fd < fdp->fd_freefile)
fdp->fd_freefile = fd;
if (fd == fdp->fd_lastfile)
fdp->fd_lastfile = fd_last_used(fdp, 0, fd);
fdp->fd_lastfile = fd_last_used(fdp, fd);
}
/*