diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2004-07-13 20:23:03 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2004-07-13 20:23:03 +0000 |
| commit | ad83d07f62a79e7725d31b41d3f0316526a83634 (patch) | |
| tree | c7af1d9a821e13a1b098b430dd419a65f46e75a1 /kernel/file.c | |
| parent | 2529ca23efd245afa9fb941626bb6caa5551f3f6 (diff) | |
| download | libfuse-ad83d07f62a79e7725d31b41d3f0316526a83634.tar.gz | |
fix minor bug
Diffstat (limited to 'kernel/file.c')
| -rw-r--r-- | kernel/file.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/kernel/file.c b/kernel/file.c index 215d9b5..8e32f45 100644 --- a/kernel/file.c +++ b/kernel/file.c @@ -345,14 +345,20 @@ static ssize_t fuse_read(struct file *file, char *buf, size_t count, char *tmpbuf; ssize_t res = 0; loff_t pos = *ppos; + unsigned int max_read = count < fc->max_read ? count : fc->max_read; - tmpbuf = kmalloc(count < fc->max_read ? count : fc->max_read, - GFP_KERNEL); + do { + tmpbuf = kmalloc(max_read, GFP_KERNEL); + if (tmpbuf) + break; + + max_read /= 2; + } while (max_read > PAGE_CACHE_SIZE / 4); if (!tmpbuf) return -ENOMEM; while (count) { - size_t nbytes = count < fc->max_read ? count : fc->max_read; + size_t nbytes = count < max_read ? count : max_read; ssize_t res1; res1 = fuse_send_read(inode, tmpbuf, pos, nbytes); if (res1 < 0) { |