Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2636.git;a=commitdiff;h=3d135c95babfd9aec0dfe5be53dd94a25c97f477
commit 3d135c95babfd9aec0dfe5be53dd94a25c97f477
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Mon Oct 25 23:48:41 2010 +0200
redirfs-0.10-1-i686
- version bump
diff --git a/source/apps-extra/redirfs/FrugalBuild
b/source/apps-extra/redirfs/FrugalBuild
index d7cb6c9..322b11a 100644
--- a/source/apps-extra/redirfs/FrugalBuild
+++ b/source/apps-extra/redirfs/FrugalBuild
@@ -2,9 +2,9 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>
pkgname=redirfs
-pkgver=0.7
+pkgver=0.10
realver=${pkgver/pre/-pre}
-pkgrel=14
+pkgrel=1
pkgdesc="Redirecting FileSystem"
url="http://www.redirfs.org/tiki-index.php";
_F_kernelmod_scriptlet=$pkgname.install
@@ -13,10 +13,9 @@ groups=('apps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump
http://www.redirfs.org/tiki-index.php?page=redirfs_download|grep -v pre
|Flasttar"
source=(http://www.redirfs.org/packages/$pkgname-$realver.tar.gz \
- kernel-2.6.3{1,4}.patch)
-sha1sums=('91705689def812ca50db2d1d461509fe5ae9a753' \
- 'c46860548855b658885fd292ce7ced9d725e7dc9' \
- '66c506fcd4dc9fe2daca1e0fde862a84e9619f45')
+ kernel-2.6.36.patch)
+sha1sums=('48fd1f36607f85560f4ff21cd0291d1c4f805364' \
+ '1b0a774f7a5cfaec43d5d004d113fc92798dffdd')
build()
{
diff --git a/source/apps-extra/redirfs/kernel-2.6.31.patch
b/source/apps-extra/redirfs/kernel-2.6.31.patch
deleted file mode 100644
index 190158f..0000000
--- a/source/apps-extra/redirfs/kernel-2.6.31.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- redirfs/rfs_path.c 2009/09/04 12:43:48 1.1
-+++ redirfs/rfs_path.c 2009/09/04 12:45:35
-@@ -683,8 +683,9 @@
- spin_unlock(&dcache_lock);
- dput(dtmp);
- mntput(mtmp);
-+ struct path path = { .mnt = mmnt, .dentry = dmnt };
-
-- if (follow_up(&mmnt, &dmnt)) {
-+ if (follow_up(&path)) {
- dentry = dmnt;
- mnt = mmnt;
- goto again;
diff --git a/source/apps-extra/redirfs/kernel-2.6.34.patch
b/source/apps-extra/redirfs/kernel-2.6.34.patch
deleted file mode 100644
index 3379716..0000000
--- a/source/apps-extra/redirfs/kernel-2.6.34.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/rfs.h b/rfs.h
-index c6ff02b..ed0dd13 100644
---- a/rfs.h
-+++ b/rfs.h
-@@ -28,6 +28,7 @@
- #include <linux/wait.h>
- #include <linux/sched.h>
- #include <linux/quotaops.h>
-+#include <linux/slab.h>
- #include "redirfs.h"
-
- #define RFS_ADD_OP(ops_new, op) \
-diff --git a/rfs_inode.c b/rfs_inode.c
-index 34a3f37..43f4142 100644
---- a/rfs_inode.c
-+++ b/rfs_inode.c
-@@ -752,7 +752,7 @@ static int rfs_setattr_default(struct dentry *dentry,
struct iattr *iattr)
-
- if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
- (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid))
-- return rfs_dq_transfer(inode, iattr) ? -EDQUOT : 0;
-+ return dquot_transfer(inode, iattr) ? -EDQUOT : 0;
-
- return inode_setattr(inode, iattr);
- }
diff --git a/source/apps-extra/redirfs/kernel-2.6.36.patch
b/source/apps-extra/redirfs/kernel-2.6.36.patch
new file mode 100644
index 0000000..1f1cd4c
--- /dev/null
+++ b/source/apps-extra/redirfs/kernel-2.6.36.patch
@@ -0,0 +1,40 @@
+diff --git a/rfs_inode.c b/rfs_inode.c
+index f6100ea..bd8890f 100644
+--- a/rfs_inode.c
++++ b/rfs_inode.c
+@@ -734,6 +734,7 @@ static int rfs_setattr_default(struct dentry *dentry,
struct iattr *iattr)
+ {
+ struct inode *inode = dentry->d_inode;
+ int rv;
++ unsigned int ia_valid = iattr->ia_valid;
+
+ rv = inode_change_ok(inode, iattr);
+ if (rv)
+@@ -745,7 +746,16 @@ static int rfs_setattr_default(struct dentry *dentry,
struct iattr *iattr)
+ return rfs_dq_transfer(inode, iattr) ? -EDQUOT : 0;
+ #endif
+
+- return inode_setattr(inode, iattr);
++ if (ia_valid & ATTR_SIZE &&
++ iattr->ia_size != i_size_read(inode)) {
++ int error;
++ error = vmtruncate(inode, iattr->ia_size);
++ if (error)
++ return error;
++ }
++ setattr_copy(inode, iattr);
++ mark_inode_dirty(inode);
++ return 0;
+ }
+
+ static int rfs_setattr(struct dentry *dentry, struct iattr *iattr)
+--- redirfs-0.10/rfs.h.orig 2010-10-25 23:47:25.388000451 +0200
++++ redirfs-0.10/rfs.h 2010-10-25 23:47:37.722000451 +0200
+@@ -29,6 +29,7 @@
+ #include <linux/sched.h>
+ #include <linux/quotaops.h>
+ #include <linux/slab.h>
++#include <linux/mm.h>
+ #include "redirfs.h"
+
+ #define RFS_ADD_OP(ops_new, op) \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
