sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

semaphore not being initialized; wrong offset used

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1245 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-11-15 19:18:32 +00:00
parent 3855baf8d9
commit 193bfbd032
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/loop.c
View File

@ -211,13 +211,13 @@ static ssize_t loop_read(FAR struct inode *inode, unsigned char *buffer,
if (start_sector + nsectors > dev->nsectors) if (start_sector + nsectors > dev->nsectors)
{ {
dbg("Seek failed for offset=%d: %d\n", (int)offset, errno); dbg("Read past end of file\n");
return -EIO; return -EIO;
} }
/* Calculate the offset to read the sectors and seek to the position */ /* Calculate the offset to read the sectors and seek to the position */
offset = start_sector * dev->sectsize + offset; offset = start_sector * dev->sectsize + dev->offset;
ret = lseek(dev->fd, offset, SEEK_SET); ret = lseek(dev->fd, offset, SEEK_SET);
if (ret == (off_t)-1) if (ret == (off_t)-1)
{ {
@ -264,7 +264,7 @@ static ssize_t loop_write(FAR struct inode *inode, const unsigned char *buffer,
/* Calculate the offset to write the sectors and seek to the position */ /* Calculate the offset to write the sectors and seek to the position */
offset = start_sector * dev->sectsize + offset; offset = start_sector * dev->sectsize + dev->offset;
ret = lseek(dev->fd, offset, SEEK_SET); ret = lseek(dev->fd, offset, SEEK_SET);
if (ret == (off_t)-1) if (ret == (off_t)-1)
{ {
@ -373,8 +373,9 @@ int losetup(const char *devname, const char *filename, uint16 sectsize,
return -ENOMEM; return -ENOMEM;
} }
/* Initialize the geometry */ /* Initialize the loop device structure. */
sem_init(&dev->sem, 0, 1);
dev->nsectors = (sb.st_size - offset) / sectsize; dev->nsectors = (sb.st_size - offset) / sectsize;
dev->sectsize = sectsize; dev->sectsize = sectsize;
dev->offset = offset; dev->offset = offset;