Author: arekm Date: Sun Jan 20 12:00:56 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- revert some mm stuff
---- Files affected:
SOURCES:
reiser4-for-2.6.24.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/reiser4-for-2.6.24.patch
diff -u SOURCES/reiser4-for-2.6.24.patch:1.1.2.1
SOURCES/reiser4-for-2.6.24.patch:1.1.2.2
--- SOURCES/reiser4-for-2.6.24.patch:1.1.2.1 Sun Jan 20 12:48:30 2008
+++ SOURCES/reiser4-for-2.6.24.patch Sun Jan 20 13:00:51 2008
@@ -78632,148 +78632,6 @@
+ End:
+*/
_
-From: Christoph Lameter <[EMAIL PROTECTED]>
-
-Reiser4 only exists in mm. So split this off.
-
-Signed-off-by: Christoph Lameter <[EMAIL PROTECTED]>
-Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
----
-
- fs/reiser4/plugin/file/cryptcompress.c | 8 +++-----
- fs/reiser4/plugin/file/file.c | 4 ++--
- fs/reiser4/plugin/item/ctail.c | 8 ++++----
- fs/reiser4/plugin/item/extent_file_ops.c | 4 ++--
- fs/reiser4/plugin/item/tail.c | 3 +--
- 5 files changed, 12 insertions(+), 15 deletions(-)
-
-diff -puN
fs/reiser4/plugin/file/cryptcompress.c~reiser4-portion-of-zero_user-cleanup-patch
fs/reiser4/plugin/file/cryptcompress.c
----
a/fs/reiser4/plugin/file/cryptcompress.c~reiser4-portion-of-zero_user-cleanup-patch
-+++ a/fs/reiser4/plugin/file/cryptcompress.c
-@@ -2056,7 +2056,7 @@ static int write_hole(struct inode *inod
-
- to_pg = min((typeof(pg_off))PAGE_CACHE_SIZE - pg_off, cl_count);
- lock_page(page);
-- zero_user_page(page, pg_off, to_pg, KM_USER0);
-+ zero_user(page, pg_off, to_pg);
- SetPageUptodate(page);
- reiser4_set_page_dirty_internal(page);
- mark_page_accessed(page);
-@@ -2294,8 +2294,7 @@ static int read_some_cluster_pages(struc
- off = off_to_pgoff(win->off+win->count+win->delta);
- if (off) {
- lock_page(pg);
-- zero_user_page(pg, off, PAGE_CACHE_SIZE - off,
-- KM_USER0);
-+ zero_user_segment(pg, off, PAGE_CACHE_SIZE);
- unlock_page(pg);
- }
- }
-@@ -2342,8 +2341,7 @@ static int read_some_cluster_pages(struc
-
- offset =
- off_to_pgoff(win->off + win->count + win->delta);
-- zero_user_page(pg, offset, PAGE_CACHE_SIZE - offset,
-- KM_USER0);
-+ zero_user_segment(pg, offset, PAGE_CACHE_SIZE);
- unlock_page(pg);
- /* still not uptodate */
- break;
-diff -puN
fs/reiser4/plugin/file/file.c~reiser4-portion-of-zero_user-cleanup-patch
fs/reiser4/plugin/file/file.c
---- a/fs/reiser4/plugin/file/file.c~reiser4-portion-of-zero_user-cleanup-patch
-+++ a/fs/reiser4/plugin/file/file.c
-@@ -532,7 +532,7 @@ static int shorten_file(struct inode *in
-
- lock_page(page);
- assert("vs-1066", PageLocked(page));
-- zero_user_page(page, padd_from, PAGE_CACHE_SIZE - padd_from, KM_USER0);
-+ zero_user_segment(page, padd_from, PAGE_CACHE_SIZE);
- unlock_page(page);
- page_cache_release(page);
- /* the below does up(sbinfo->delete_mutex). Do not get confused */
-@@ -1433,7 +1433,7 @@ int readpage_unix_file(struct file *file
-
- if (page->mapping->host->i_size <= page_offset(page)) {
- /* page is out of file */
-- zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
-+ zero_user(page, 0, PAGE_CACHE_SIZE);
- SetPageUptodate(page);
- unlock_page(page);
- return 0;
-diff -puN
fs/reiser4/plugin/item/ctail.c~reiser4-portion-of-zero_user-cleanup-patch
fs/reiser4/plugin/item/ctail.c
---- a/fs/reiser4/plugin/item/ctail.c~reiser4-portion-of-zero_user-cleanup-patch
-+++ a/fs/reiser4/plugin/item/ctail.c
-@@ -638,7 +638,7 @@ int do_readpage_ctail(struct inode * ino
- goto exit;
- to_page = pbytes(page_index(page), inode);
- if (to_page == 0) {
-- zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
-+ zero_user(page, 0, PAGE_CACHE_SIZE);
- SetPageUptodate(page);
- goto exit;
- }
-@@ -655,7 +655,7 @@ int do_readpage_ctail(struct inode * ino
- /* refresh bytes */
- to_page = pbytes(page_index(page), inode);
- if (to_page == 0) {
-- zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
-+ zero_user(page, 0, PAGE_CACHE_SIZE);
- SetPageUptodate(page);
- goto exit;
- }
-@@ -678,7 +678,7 @@ int do_readpage_ctail(struct inode * ino
- */
- case FAKE_DISK_CLUSTER:
- /* fill the page by zeroes */
-- zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
-+ zero_user(page, 0, PAGE_CACHE_SIZE);
- SetPageUptodate(page);
- break;
- case PREP_DISK_CLUSTER:
-@@ -788,7 +788,7 @@ static int ctail_readpages_filler(void *
- return 0;
- }
- if (pbytes(page_index(page), inode) == 0) {
-- zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
-+ zero_user(page, 0, PAGE_CACHE_SIZE);
- SetPageUptodate(page);
- unlock_page(page);
- return 0;
-diff -puN
fs/reiser4/plugin/item/extent_file_ops.c~reiser4-portion-of-zero_user-cleanup-patch
fs/reiser4/plugin/item/extent_file_ops.c
----
a/fs/reiser4/plugin/item/extent_file_ops.c~reiser4-portion-of-zero_user-cleanup-patch
-+++ a/fs/reiser4/plugin/item/extent_file_ops.c
-@@ -1136,7 +1136,7 @@ int reiser4_do_readpage_extent(reiser4_e
- */
- j = jfind(mapping, index);
- if (j == NULL) {
-- zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
-+ zero_user(page, 0, PAGE_CACHE_SIZE);
- SetPageUptodate(page);
- unlock_page(page);
- return 0;
-@@ -1151,7 +1151,7 @@ int reiser4_do_readpage_extent(reiser4_e
- block = *jnode_get_io_block(j);
- spin_unlock_jnode(j);
- if (block == 0) {
-- zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
-+ zero_user(page, 0, PAGE_CACHE_SIZE);
- SetPageUptodate(page);
- unlock_page(page);
- jput(j);
-diff -puN
fs/reiser4/plugin/item/tail.c~reiser4-portion-of-zero_user-cleanup-patch
fs/reiser4/plugin/item/tail.c
---- a/fs/reiser4/plugin/item/tail.c~reiser4-portion-of-zero_user-cleanup-patch
-+++ a/fs/reiser4/plugin/item/tail.c
-@@ -392,8 +392,7 @@ static int do_readpage_tail(uf_coord_t *
-
- done:
- if (mapped != PAGE_CACHE_SIZE)
-- zero_user_page(page, mapped, PAGE_CACHE_SIZE - mapped,
-- KM_USER0);
-+ zero_user_segment(page, mapped, PAGE_CACHE_SIZE);
- SetPageUptodate(page);
- out_unlock_page:
- unlock_page(page);
-_
From: "Serge E. Hallyn" <[EMAIL PROTECTED]>
Reiser4 gives root some reserved blocks. Replace the uid==0 check, which
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/reiser4-for-2.6.24.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
