diff options
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/fs/fat/fs_fat32.c | 18 |
2 files changed, 12 insertions, 9 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index f60b7b9b6..444119973 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -2447,3 +2447,6 @@ * lib/net/lib_inetntop.c: Add inet_ntop(). * lib/net/lib_inetpton.c: Add inet_pton(). * include/pthread.h: Correct PTHREAD_MUTEX_INITIALIZER. + * fs/fat/fs_fatfs.c: Fix and error in the FAT statfs() implementation that + was causing some block counts to be reported incorrectly (reported by + david_s5y).
\ No newline at end of file diff --git a/nuttx/fs/fat/fs_fat32.c b/nuttx/fs/fat/fs_fat32.c index 0ec1d78cf..909d5a2dc 100644 --- a/nuttx/fs/fat/fs_fat32.c +++ b/nuttx/fs/fat/fs_fat32.c @@ -1,8 +1,8 @@ /**************************************************************************** * fs/fat/fs_fat32.c * - * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * References: * Microsoft FAT documentation @@ -1706,13 +1706,13 @@ static int fat_statfs(struct inode *mountpt, struct statfs *buf) /* Everything else follows in units of clusters */ - buf->f_blocks = fs->fs_nclusters; /* Total data blocks in the file system */ - buf->f_bfree = fat_nfreeclusters(fs, &buf->f_bfree); /* Free blocks in the file system */ - buf->f_bavail = buf->f_bfree; /* Free blocks avail to non-superuser */ - buf->f_namelen = (8+1+3); /* Maximum length of filenames */ - - fat_semgive(fs); - return OK; + ret = fat_nfreeclusters(fs, &buf->f_bfree); /* Free blocks in the file system */ + if (ret >= 0) + { + buf->f_blocks = fs->fs_nclusters; /* Total data blocks in the file system */ + buf->f_bavail = buf->f_bfree; /* Free blocks avail to non-superuser */ + buf->f_namelen = (8+1+3); /* Maximum length of filenames */ + } errout_with_semaphore: fat_semgive(fs); |