projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[deliverable/linux.git]
/
fs
/
ext4
/
inline.c
diff --git
a/fs/ext4/inline.c
b/fs/ext4/inline.c
index 7cbdd3752ba50fcc076ba9ab55c76be65cff3cce..7bc6c855cc18ca992ac3830d3b3010e63597bc5d 100644
(file)
--- a/
fs/ext4/inline.c
+++ b/
fs/ext4/inline.c
@@
-482,7
+482,7
@@
static int ext4_read_inline_page(struct inode *inode, struct page *page)
ret = ext4_read_inline_data(inode, kaddr, len, &iloc);
flush_dcache_page(page);
kunmap_atomic(kaddr);
ret = ext4_read_inline_data(inode, kaddr, len, &iloc);
flush_dcache_page(page);
kunmap_atomic(kaddr);
- zero_user_segment(page, len, PAGE_
CACHE_
SIZE);
+ zero_user_segment(page, len, PAGE_SIZE);
SetPageUptodate(page);
brelse(iloc.bh);
SetPageUptodate(page);
brelse(iloc.bh);
@@
-507,7
+507,7
@@
int ext4_readpage_inline(struct inode *inode, struct page *page)
if (!page->index)
ret = ext4_read_inline_page(inode, page);
else if (!PageUptodate(page)) {
if (!page->index)
ret = ext4_read_inline_page(inode, page);
else if (!PageUptodate(page)) {
- zero_user_segment(page, 0, PAGE_
CACHE_
SIZE);
+ zero_user_segment(page, 0, PAGE_SIZE);
SetPageUptodate(page);
}
SetPageUptodate(page);
}
@@
-595,7
+595,7
@@
retry:
if (ret) {
unlock_page(page);
if (ret) {
unlock_page(page);
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
page = NULL;
ext4_orphan_add(handle, inode);
up_write(&EXT4_I(inode)->xattr_sem);
page = NULL;
ext4_orphan_add(handle, inode);
up_write(&EXT4_I(inode)->xattr_sem);
@@
-621,7
+621,7
@@
retry:
out:
if (page) {
unlock_page(page);
out:
if (page) {
unlock_page(page);
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
}
if (sem_held)
up_write(&EXT4_I(inode)->xattr_sem);
}
if (sem_held)
up_write(&EXT4_I(inode)->xattr_sem);
@@
-690,7
+690,7
@@
int ext4_try_to_write_inline_data(struct address_space *mapping,
if (!ext4_has_inline_data(inode)) {
ret = 0;
unlock_page(page);
if (!ext4_has_inline_data(inode)) {
ret = 0;
unlock_page(page);
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
goto out_up_read;
}
goto out_up_read;
}
@@
-815,7
+815,7
@@
static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,
if (ret) {
up_read(&EXT4_I(inode)->xattr_sem);
unlock_page(page);
if (ret) {
up_read(&EXT4_I(inode)->xattr_sem);
unlock_page(page);
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
ext4_truncate_failed_write(inode);
return ret;
}
ext4_truncate_failed_write(inode);
return ret;
}
@@
-829,7
+829,7
@@
out:
up_read(&EXT4_I(inode)->xattr_sem);
if (page) {
unlock_page(page);
up_read(&EXT4_I(inode)->xattr_sem);
if (page) {
unlock_page(page);
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
}
return ret;
}
}
return ret;
}
@@
-919,7
+919,7
@@
retry_journal:
out_release_page:
up_read(&EXT4_I(inode)->xattr_sem);
unlock_page(page);
out_release_page:
up_read(&EXT4_I(inode)->xattr_sem);
unlock_page(page);
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
out_journal:
ext4_journal_stop(handle);
out:
out_journal:
ext4_journal_stop(handle);
out:
@@
-947,7
+947,7
@@
int ext4_da_write_inline_data_end(struct inode *inode, loff_t pos,
i_size_changed = 1;
}
unlock_page(page);
i_size_changed = 1;
}
unlock_page(page);
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
/*
* Don't mark the inode dirty under page lock. First, it unnecessarily
/*
* Don't mark the inode dirty under page lock. First, it unnecessarily
This page took
0.026503 seconds
and
5
git commands to generate.