[ANNOUNCE] eCryptfs in 2.6.17-rc4-mm1

[Michael Halcrow]

eCryptfs is now upstream in the 2.6.17-rc4-mm1 kernel. Users
wanted!

Due to a patch conflict with fscache for that release (the conflicting
fscache patch is dropped for the next -mm release), the patch at the
end of this message is necessary to get a clean build.

Mike

---

 super.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/ecryptfs/super.c b/fs/ecryptfs/super.c
index 1d344e0..b00df12 100644
--- a/fs/ecryptfs/super.c
+++ b/fs/ecryptfs/super.c
@@ -124,9 +124,12 @@ static void ecryptfs_put_super(struct su
  * Get the filesystem statistics. Currently, we let this pass right through
  * to the lower filesystem and take no action ourselves.
  */
-static inline int ecryptfs_statfs(struct super_block *sb, struct kstatfs *buf)
+static int ecryptfs_statfs(struct vfsmount *vfs_mnt, struct kstatfs *buf)
 {
-	return vfs_statfs(ecryptfs_superblock_to_lower(sb), buf);
+	struct vfsmount *lower_mnt;
+
+        lower_mnt = ecryptfs_superblock_to_private(vfs_mnt->mnt_sb)->lower_mnt;
+        return vfs_statfs(lower_mnt, buf);
 }
 
 /**
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 481 bytes
Desc: Digital signature
Url : http://plug.org/pipermail/plug/attachments/20060519/b128e0b3/attachment.pgp