diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-19 01:06:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-19 01:06:44 -0800 |
| commit | b76a852bfb51ffe25505bab3dfd87ddbc821c2aa (patch) | |
| tree | 25e4f88a1d60f92c7f00f19e835a23d1502c5c82 /fs/cifs/file.c | |
| parent | 612cbdcf44289e81a4327d8f67fcc41e07ad33c3 (diff) | |
| parent | 6ab007bf3fd8db711771db1e93880213a63ecd38 (diff) | |
Merge bk://are.twiddle.net/axp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 0510f81840..03aa43894f 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -423,6 +423,7 @@ cifs_partialpagewrite(struct page *page,unsigned from, unsigned to) return rc; } +#if 0 static int cifs_writepages(struct address_space *mapping, struct writeback_control *wbc) { @@ -434,6 +435,7 @@ cifs_writepages(struct address_space *mapping, struct writeback_control *wbc) FreeXid(xid); return rc; } +#endif static int cifs_writepage(struct page* page, struct writeback_control *wbc) @@ -635,7 +637,7 @@ static void cifs_copy_cache_pages(struct address_space *mapping, } page_cache_get(page); - target = kmap(page); + target = kmap_atomic(page,KM_USER0); if(PAGE_CACHE_SIZE > bytes_read) { memcpy(target,data,bytes_read); @@ -649,7 +651,7 @@ static void cifs_copy_cache_pages(struct address_space *mapping, __pagevec_lru_add(plru_pvec); flush_dcache_page(page); SetPageUptodate(page); - kunmap(page); + kunmap_atomic(page,KM_USER0); unlock_page(page); page_cache_release(page); data += PAGE_CACHE_SIZE; |