diff options
Diffstat (limited to 'storeio/dev.c')
| -rw-r--r-- | storeio/dev.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/storeio/dev.c b/storeio/dev.c index 9a9694b2..31b084f9 100644 --- a/storeio/dev.c +++ b/storeio/dev.c @@ -1,6 +1,7 @@ /* store `device' I/O - Copyright (C) 1995,96,98,99,2000,01,02 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2008 + Free Software Foundation, Inc. Written by Miles Bader <miles@gnu.org> This program is free software; you can redistribute it and/or @@ -100,8 +101,8 @@ dev_buf_fill (struct dev *dev, off_t offs) /* Do an in-buffer partial-block I/O operation. */ static error_t dev_buf_rw (struct dev *dev, size_t buf_offs, size_t *io_offs, size_t *len, - inline error_t (*const buf_rw) (size_t buf_offs, - size_t io_offs, size_t len)) + error_t (*const buf_rw) (size_t buf_offs, + size_t io_offs, size_t len)) { size_t block_size = dev->store->block_size; @@ -225,16 +226,16 @@ 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 buffered_rw (struct dev *dev, off_t offs, size_t len, size_t *amount, - inline error_t (* const buf_rw) (size_t buf_offs, - size_t io_offs, size_t len), - inline error_t (* const raw_rw) (off_t offs, - size_t io_offs, size_t len, - size_t *amount)) + error_t (* const buf_rw) (size_t buf_offs, + size_t io_offs, size_t len), + error_t (* const raw_rw) (off_t offs, + size_t io_offs, size_t len, + size_t *amount)) { error_t err = 0; unsigned block_mask = dev->block_mask; @@ -291,11 +292,11 @@ buffered_rw (struct dev *dev, off_t offs, size_t len, size_t *amount, buffered in DEV, and RAW_RW to do I/O directly to DEV's store. */ static inline error_t dev_rw (struct dev *dev, off_t offs, size_t len, size_t *amount, - inline error_t (* const buf_rw) (size_t buf_offs, - size_t io_offs, size_t len), - inline error_t (* const raw_rw) (off_t offs, - size_t io_offs, size_t len, - size_t *amount)) + error_t (* const buf_rw) (size_t buf_offs, + size_t io_offs, size_t len), + error_t (* const raw_rw) (off_t offs, + size_t io_offs, size_t len, + size_t *amount)) { error_t err; unsigned block_mask = dev->block_mask; @@ -311,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); } |