From 0695ac4e50383131563dd1ec7aa4d571003fd58f Mon Sep 17 00:00:00 2001 From: geos_one Date: Tue, 27 Jan 2009 20:25:36 +0000 Subject: [PATCH] net-fs/novell-novfs: 2.6.28.1 patch --- .../net-fs/novell-novfs/ChangeLog | 4 +++ .../net-fs/novell-novfs/Manifest | 4 +-- .../files/novfs-2.0.0.444-2.6.28-1.patch | 34 ++++++++++++++++--- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog b/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog index b9275b7..ea8f2e6 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog +++ b/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 27 Jan 2009; Mario Fetka + files/novfs-2.0.0.444-2.6.28-1.patch: + 2.6.28.1 patch + 27 Jan 2009; Mario Fetka files/novfs-2.0.0.444-2.6.28-1.patch: 2.6.28 support fix diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/Manifest b/trunk/novell4gentoo/net-fs/novell-novfs/Manifest index a7bf0dc..dc9bd83 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/Manifest +++ b/trunk/novell4gentoo/net-fs/novell-novfs/Manifest @@ -1,7 +1,7 @@ AUX novell-novfs-2.0.0-section_mismatch-1.patch 1943 RMD160 e6a025066d935ff69669b67eb77157a6cb96c525 SHA1 0caa5ee241ed56cd52741815192659612eefae2b SHA256 38b1be3c3b61c15212063af75cfbd84ac46b4aab8248a11c9ec121a5496a86d6 AUX novell-novfs-2.0.0-vfs.patch 524 RMD160 caab5f55b21e0a84c90529af01018f076069e046 SHA1 e4ff839c81ea455975104f096c81a3f7e2564867 SHA256 b2a21ed547f05bd141f02062dd219e445ab1f4170dbf9f336f72281f2bea00ee AUX novfs-2.0.0-2.6.25.patch 1417 RMD160 60ba9006d215bc2bf2723bd466f1dcebb27ebe53 SHA1 fb067c32f29889a665df06c6763b93f497be5466 SHA256 1f532cd3aee291ca31c16d4e6b6dc17227c2052f70ededbf20740b23e6409666 -AUX novfs-2.0.0.444-2.6.28-1.patch 684 RMD160 fe1befdcd348bdfa034cb0c1dfcf83906b77bc58 SHA1 c7243f2867a70c77f4bde2089f264cff2e35aeae SHA256 db63656e771172aa431fd1aa921817e8f2c143bd50a096a1b24c47bb3ed273cb +AUX novfs-2.0.0.444-2.6.28-1.patch 1360 RMD160 f7e8442cc59f30a6fd324842eeaaeb09127252bb SHA1 8d1df6b40f66ec03b98a634ce532a0a8a6ce6c46 SHA256 a49b836bf6fa3e2cb240c75cd88c52b1c205b5220e85af8ee7d70b812b62e38e AUX novfs-2.0.0.444-apparmor-1.patch 734 RMD160 f615b8f1f3631a17e251ea39dd5f093562a2eb4d SHA1 cbb850fd04091fbebd042a6ea5b5096651a564b1 SHA256 f08cecbfc61f78018222c6a7065c63ac9ad29aba76270d824e637d62e6b108eb DIST novfs-2.0.0-23.src.rpm 133355 RMD160 67a07d2eb8b12cefe40d44dab9c94670c64cc54d SHA1 0a3573587b06a4c82e2f34b40749df04ff2b414b SHA256 e5e4c234a39220b8f86c6bc45d446abe0ec20b46d6b72792541ad5e3bc3ebbeb DIST novfs-2.0.0.440.tar.bz2 72449 RMD160 6b4576a06e83669ab03dc53f80f681aa7f54babf SHA1 54bcca34bf5104adf7287a5d07464cc0e583819d SHA256 2038c4f54f73e0fd8711f44913e7a43c1270efcd037536054053b0c6a2df8166 @@ -9,5 +9,5 @@ DIST novfs-2.0.0.444.tar.bz2 72449 RMD160 b285340a94fbcdc71d80f0296aaaeb173f68b5 EBUILD novell-novfs-2.0.0.440.ebuild 989 RMD160 164cdb135d9982703837d10b6a6fb0f6c50b4a55 SHA1 475cf55237cf14d467c06dfa9ca4297c43c56404 SHA256 bb9edabbeae362b0fa2b4d4c337891fdc7a3fc5ede6bc1218eff6f968aa9740d EBUILD novell-novfs-2.0.0.444.ebuild 978 RMD160 c0ab7ca6ceb4d8e3e284d3a1ec73a198a38890b7 SHA1 9c595198727eafa69741c05fa557e4a8cbac5070 SHA256 2b0aa390e12aede3a0350cc13e379855385e6d43f84d63da25c84c479571712d EBUILD novell-novfs-2.0.0_p23-r2.ebuild 1656 RMD160 e32d855e9ec2e3da63fcff498daadd3cf9496ffb SHA1 efbb12cde7c034d3bb06e2a008d492ee8db1dd3a SHA256 ad6321bb3e4ca534fd0abe389bceb0901a3f7f9fcd6daaa3eeec4652b04bf7ea -MISC ChangeLog 5213 RMD160 8d662d3726dc71a7e1a4f210fc1b049eb1769919 SHA1 eef2a077be0358647527ac69ef6f3b07f4a38398 SHA256 ed6a00d19749ce03233346c8d3627d10a85e98f374f511902f0e545b6860e66b +MISC ChangeLog 5322 RMD160 df5cc47287d4315a0b691d1017c5d39961e07ed8 SHA1 f67ffdad3539e712b067ec02c6369b3feff2dc8e SHA256 5a333e81082eb5f522d26f8be3759a36c4bd66e9183d9f67c7075748590a4463 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0.444-2.6.28-1.patch b/trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0.444-2.6.28-1.patch index b2d19d0..0de4209 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0.444-2.6.28-1.patch +++ b/trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0.444-2.6.28-1.patch @@ -3,12 +3,26 @@ Date: 2009-01-27 Initial Package Version: 2.0.0.444 Origin: me Upstream Status: unknown -Description: make it work with >= 2.6.28 +Description: support >= 2.6.28 diff -Naur novfs-2.0.0.444.orig/inode.c novfs-2.0.0.444/inode.c ---- novfs-2.0.0.444.orig/inode.c 2009-01-27 19:55:37.012343752 +0000 -+++ novfs-2.0.0.444/inode.c 2009-01-27 19:57:23.171092328 +0000 -@@ -1887,7 +1887,11 @@ +--- novfs-2.0.0.444.orig/inode.c 2009-01-27 20:19:47.375095216 +0000 ++++ novfs-2.0.0.444/inode.c 2009-01-27 20:18:27.000000000 +0000 +@@ -246,8 +246,13 @@ + .readpages = novfs_a_readpages, + .writepage = novfs_a_writepage, + .writepages = novfs_a_writepages, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)) ++ .write_begin = novfs_a_prepare_write, ++ .write_end = novfs_a_commit_write, ++#else + .prepare_write = novfs_a_prepare_write, + .commit_write = novfs_a_commit_write, ++#endif + .set_page_dirty = __set_page_dirty_nobuffers, + .direct_IO = novfs_a_direct_IO, + }; +@@ -1887,7 +1892,11 @@ SetPageUptodate(page); unlock_page(page); if (!pagevec_add(plru_pvec, page)) @@ -20,3 +34,15 @@ diff -Naur novfs-2.0.0.444.orig/inode.c novfs-2.0.0.444/inode.c data += PAGE_CACHE_SIZE; } return; +@@ -2383,7 +2392,11 @@ + page_cache_release(page); + } + ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) ++ pagevec_lru_add_file(&lru_pvec); ++ #else + pagevec_lru_add(&lru_pvec); ++ #endif + kfree(rbuf); + } else { + retCode = -ENOMEM;