projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-2.6-microblaze.git]
/
fs
/
direct-io.c
diff --git
a/fs/direct-io.c
b/fs/direct-io.c
index
476f1ec
..
4720377
100644
(file)
--- a/
fs/direct-io.c
+++ b/
fs/direct-io.c
@@
-172,7
+172,7
@@
static inline int dio_refill_pages(struct dio *dio, struct dio_submit *sdio)
*/
if (dio->page_errors == 0)
dio->page_errors = ret;
*/
if (dio->page_errors == 0)
dio->page_errors = ret;
-
page_cache_get
(page);
+
get_page
(page);
dio->pages[0] = page;
sdio->head = 0;
sdio->tail = 1;
dio->pages[0] = page;
sdio->head = 0;
sdio->tail = 1;
@@
-424,7
+424,7
@@
static inline void dio_bio_submit(struct dio *dio, struct dio_submit *sdio)
static inline void dio_cleanup(struct dio *dio, struct dio_submit *sdio)
{
while (sdio->head < sdio->tail)
static inline void dio_cleanup(struct dio *dio, struct dio_submit *sdio)
{
while (sdio->head < sdio->tail)
- p
age_cache_releas
e(dio->pages[sdio->head++]);
+ p
ut_pag
e(dio->pages[sdio->head++]);
}
/*
}
/*
@@
-487,7
+487,7
@@
static int dio_bio_complete(struct dio *dio, struct bio *bio)
if (dio->rw == READ && !PageCompound(page) &&
dio->should_dirty)
set_page_dirty_lock(page);
if (dio->rw == READ && !PageCompound(page) &&
dio->should_dirty)
set_page_dirty_lock(page);
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
}
err = bio->bi_error;
bio_put(bio);
}
err = bio->bi_error;
bio_put(bio);
@@
-696,7
+696,7
@@
static inline int dio_bio_add_page(struct dio_submit *sdio)
*/
if ((sdio->cur_page_len + sdio->cur_page_offset) == PAGE_SIZE)
sdio->pages_in_io--;
*/
if ((sdio->cur_page_len + sdio->cur_page_offset) == PAGE_SIZE)
sdio->pages_in_io--;
-
page_cache_get
(sdio->cur_page);
+
get_page
(sdio->cur_page);
sdio->final_block_in_bio = sdio->cur_page_block +
(sdio->cur_page_len >> sdio->blkbits);
ret = 0;
sdio->final_block_in_bio = sdio->cur_page_block +
(sdio->cur_page_len >> sdio->blkbits);
ret = 0;
@@
-810,13
+810,13
@@
submit_page_section(struct dio *dio, struct dio_submit *sdio, struct page *page,
*/
if (sdio->cur_page) {
ret = dio_send_cur_page(dio, sdio, map_bh);
*/
if (sdio->cur_page) {
ret = dio_send_cur_page(dio, sdio, map_bh);
- p
age_cache_releas
e(sdio->cur_page);
+ p
ut_pag
e(sdio->cur_page);
sdio->cur_page = NULL;
if (ret)
return ret;
}
sdio->cur_page = NULL;
if (ret)
return ret;
}
-
page_cache_get(page);
/* It is in dio */
+
get_page(page);
/* It is in dio */
sdio->cur_page = page;
sdio->cur_page_offset = offset;
sdio->cur_page_len = len;
sdio->cur_page = page;
sdio->cur_page_offset = offset;
sdio->cur_page_len = len;
@@
-830,7
+830,7
@@
out:
if (sdio->boundary) {
ret = dio_send_cur_page(dio, sdio, map_bh);
dio_bio_submit(dio, sdio);
if (sdio->boundary) {
ret = dio_send_cur_page(dio, sdio, map_bh);
dio_bio_submit(dio, sdio);
- p
age_cache_releas
e(sdio->cur_page);
+ p
ut_pag
e(sdio->cur_page);
sdio->cur_page = NULL;
}
return ret;
sdio->cur_page = NULL;
}
return ret;
@@
-947,7
+947,7
@@
static int do_direct_IO(struct dio *dio, struct dio_submit *sdio,
ret = get_more_blocks(dio, sdio, map_bh);
if (ret) {
ret = get_more_blocks(dio, sdio, map_bh);
if (ret) {
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
goto out;
}
if (!buffer_mapped(map_bh))
goto out;
}
if (!buffer_mapped(map_bh))
@@
-988,7
+988,7
@@
do_holes:
/* AKPM: eargh, -ENOTBLK is a hack */
if (dio->rw & WRITE) {
/* AKPM: eargh, -ENOTBLK is a hack */
if (dio->rw & WRITE) {
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
return -ENOTBLK;
}
return -ENOTBLK;
}
@@
-1001,7
+1001,7
@@
do_holes:
if (sdio->block_in_file >=
i_size_aligned >> blkbits) {
/* We hit eof */
if (sdio->block_in_file >=
i_size_aligned >> blkbits) {
/* We hit eof */
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
goto out;
}
zero_user(page, from, 1 << blkbits);
goto out;
}
zero_user(page, from, 1 << blkbits);
@@
-1041,7
+1041,7
@@
do_holes:
sdio->next_block_for_io,
map_bh);
if (ret) {
sdio->next_block_for_io,
map_bh);
if (ret) {
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
goto out;
}
sdio->next_block_for_io += this_chunk_blocks;
goto out;
}
sdio->next_block_for_io += this_chunk_blocks;
@@
-1057,7
+1057,7
@@
next_block:
}
/* Drop the ref which was taken in get_user_pages() */
}
/* Drop the ref which was taken in get_user_pages() */
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
}
out:
return ret;
}
out:
return ret;
@@
-1281,7
+1281,7
@@
do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
ret2 = dio_send_cur_page(dio, &sdio, &map_bh);
if (retval == 0)
retval = ret2;
ret2 = dio_send_cur_page(dio, &sdio, &map_bh);
if (retval == 0)
retval = ret2;
- p
age_cache_releas
e(sdio.cur_page);
+ p
ut_pag
e(sdio.cur_page);
sdio.cur_page = NULL;
}
if (sdio.bio)
sdio.cur_page = NULL;
}
if (sdio.bio)