diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:18:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:18:59 -0800 |
| commit | dfc52b82fee5bc6713ecce3f81767a8565c4f874 (patch) | |
| tree | d48688e5ffd92742e5556791c1c8f086317203d5 /fs/buffer.c | |
| parent | a880f45a48be2956d2c78a839c472287d54435c1 (diff) | |
v2.4.9.11 -> v2.4.9.12
- Alan Cox: much more merging
- Pete Zaitcev: ymfpci race fixes
- Andrea Arkangeli: VM race fix and OOM tweak.
- Arjan Van de Ven: merge RH kernel fixes
- Andi Kleen: use more readable 'likely()/unlikely()' instead of __builtin_expect()
- Keith Owens: fix 64-bit ELF types
- Gerd Knorr: mark more broken PCI bridges, update btaudio driver
- Paul Mackerras: powermac driver update
- me: clean up PTRACE_DETACH to use common infrastructure
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index c0909b2424d1..7bf62e0a60d7 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1340,9 +1340,13 @@ void __bforget(struct buffer_head * buf) spin_unlock(&lru_list_lock); } -/* - * bread() reads a specified block and returns the buffer that contains - * it. It returns NULL if the block was unreadable. +/** + * bread() - reads a specified block and returns the bh + * @block: number of block + * @size: size (in bytes) to read + * + * Reads a specified block, and returns buffer head that + * contains it. It returns NULL if the block was unreadable. */ struct buffer_head * bread(kdev_t dev, int block, int size) { |