diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2004-11-14 09:19:51 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2004-11-14 09:19:51 +0000 |
| commit | 08ddb8e5e0af8c1326607f4d06c0dbc85733e483 (patch) | |
| tree | 55617c609dc06985307a88baba5dbedb7c2d5d0d /kernel/file.c | |
| parent | 30e8eb3e135291717eceaae69162fceb91d30aa1 (diff) | |
| download | libfuse-08ddb8e5e0af8c1326607f4d06c0dbc85733e483.tar.gz | |
merge from 2_0_merge2 to 2_1_pre1
Diffstat (limited to 'kernel/file.c')
| -rw-r--r-- | kernel/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/file.c b/kernel/file.c index a08d236..f89bfb7 100644 --- a/kernel/file.c +++ b/kernel/file.c @@ -378,7 +378,7 @@ static int fuse_readpages_fill(void *_data, struct page *page) req->pages[req->num_pages - 1]->index + 1 != page->index)) { struct fuse_conn *fc = INO_FC(page->mapping->host); fuse_send_readpages(req, data->file, inode); - data->req = req = fuse_get_request(fc); + data->req = req = fuse_get_request_nonint(fc); } req->pages[req->num_pages] = page; req->num_pages ++; @@ -392,7 +392,7 @@ static int fuse_readpages(struct file *file, struct address_space *mapping, struct fuse_conn *fc = INO_FC(inode); struct fuse_readpages_data data; - data.req = fuse_get_request(fc); + data.req = fuse_get_request_nonint(fc); data.file = file; data.inode = inode; |