diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /fatfs/pager.c | |
parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
download | hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.tar.gz hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.tar.bz2 hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.zip |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'fatfs/pager.c')
-rw-r--r-- | fatfs/pager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fatfs/pager.c b/fatfs/pager.c index 22adb089..e617af03 100644 --- a/fatfs/pager.c +++ b/fatfs/pager.c @@ -91,7 +91,7 @@ free_page_buf (void *buf) /* Find the location on disk of page OFFSET in NODE. Return the disk cluster in CLUSTER. If *LOCK is 0, then it a reader - lock is aquired on NODE's ALLOC_LOCK before doing anything, and left + lock is acquired on NODE's ALLOC_LOCK before doing anything, and left locked after return -- even if an error is returned. 0 on success or an error code otherwise is returned. */ static error_t |