diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 19:12:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 19:12:24 -0700 |
| commit | 04eef90c2e2fb860db71bff5f60d5ff0ec4c6dea (patch) | |
| tree | 0190a2610ade331b4be8e1efd094c0ad2b2ba181 /fs/exofs/inode.c | |
| parent | bb8ad2815a1210bfa56b8f8ebf0e40fbdf9198ff (diff) | |
| parent | bc47df0fa705887242c26c7b040e7cf0170ab1f1 (diff) | |
| download | op-kernel-dev-04eef90c2e2fb860db71bff5f60d5ff0ec4c6dea.zip op-kernel-dev-04eef90c2e2fb860db71bff5f60d5ff0ec4c6dea.tar.gz | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
osdblk: Adjust queue limits to lower device's limits
osdblk: a Linux block device for OSD objects
MAINTAINERS: Add osd maintained files (F:)
exofs: Avoid using file_fsync()
exofs: Remove IBM copyrights
exofs: Fix bio leak in error handling path (sync read)
Diffstat (limited to 'fs/exofs/inode.c')
| -rw-r--r-- | fs/exofs/inode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c index 77d0a29..6c10f74 100644 --- a/fs/exofs/inode.c +++ b/fs/exofs/inode.c @@ -1,8 +1,6 @@ /* * Copyright (C) 2005, 2006 - * Avishay Traeger (avishay@gmail.com) (avishay@il.ibm.com) - * Copyright (C) 2005, 2006 - * International Business Machines + * Avishay Traeger (avishay@gmail.com) * Copyright (C) 2008, 2009 * Boaz Harrosh <bharrosh@panasas.com> * @@ -295,6 +293,9 @@ static int read_exec(struct page_collect *pcol, bool is_sync) err: if (!is_sync) _unlock_pcol_pages(pcol, ret, READ); + else /* Pages unlocked by caller in sync mode only free bio */ + pcol_free(pcol); + kfree(pcol_copy); if (or) osd_end_request(or); |
