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 /storeio | |
parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'storeio')
-rw-r--r-- | storeio/dev.c | 6 | ||||
-rw-r--r-- | storeio/pager.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/storeio/dev.c b/storeio/dev.c index a7a1dd8b..31b084f9 100644 --- a/storeio/dev.c +++ b/storeio/dev.c @@ -226,7 +226,7 @@ dev_sync(struct dev *dev, int wait) } /* Takes care of buffering I/O to/from DEV for a transfer at position OFFS, - length LEN; the amount of I/O sucessfully done is returned in AMOUNT. + length LEN; the amount of I/O successfully done is returned in AMOUNT. BUF_RW is called to do I/O that's entirely inside DEV's internal buffer, and RAW_RW to do I/O directly to DEV's store. */ static inline error_t @@ -312,8 +312,8 @@ dev_rw (struct dev *dev, off_t offs, size_t len, size_t *amount, /* Some non-aligned I/O has been done, or is needed, so we need to deal with DEV's buffer, which means getting an exclusive lock. */ { - /* Aquire a writer lock instead of a reader lock. Note that other - writers may have aquired the lock by the time we get it. */ + /* Acquire a writer lock instead of a reader lock. Note that other + writers may have acquired the lock by the time we get it. */ rwlock_reader_unlock (&dev->io_lock); err = buffered_rw (dev, offs, len, amount, buf_rw, raw_rw); } diff --git a/storeio/pager.c b/storeio/pager.c index 0ad126c1..1fb1d07e 100644 --- a/storeio/pager.c +++ b/storeio/pager.c @@ -33,7 +33,7 @@ /* For pager PAGER, read one page from offset PAGE. Set *BUF to be the address of the page, and set *WRITE_LOCK if the page must be provided - read-only. The only permissable error returns are EIO, EDQUOT, and + read-only. The only permissible error returns are EIO, EDQUOT, and ENOSPC. */ error_t pager_read_page (struct user_pager_info *upi, @@ -65,7 +65,7 @@ pager_read_page (struct user_pager_info *upi, } /* For pager PAGER, synchronously write one page from BUF to offset PAGE. In - addition, vm_deallocate (or equivalent) BUF. The only permissable error + addition, vm_deallocate (or equivalent) BUF. The only permissible error returns are EIO, EDQUOT, and ENOSPC. */ error_t pager_write_page (struct user_pager_info *upi, |