head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.12.01.04.48.17;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.12.01.04.48.17;	author jsipek;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.12.04.00.47.21;	author jsipek;	state Exp;
branches;
next	;


desc
@@


1.1
log
@file fsstack-ecryptfs-more was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@More fsstack/ecryptfs related fixes
@
text
@a0 33
diff -r 7b0e48d7360a fs/ecryptfs/dentry.c
--- a/fs/ecryptfs/dentry.c	Thu Nov 30 23:38:17 2006 -0500
+++ b/fs/ecryptfs/dentry.c	Thu Nov 30 23:39:21 2006 -0500
@@@@ -61,7 +61,7 @@@@ static int ecryptfs_d_revalidate(struct 
 		struct inode *lower_inode =
 			ecryptfs_inode_to_lower(dentry->d_inode);
 
-		ecryptfs_copy_attr_all(dentry->d_inode, lower_inode);
+		fsstack_copy_attr_all(dentry->d_inode, lower_inode, NULL);
 	}
 out:
 	return rc;
diff -r 7b0e48d7360a fs/ecryptfs/ecryptfs_kernel.h
--- a/fs/ecryptfs/ecryptfs_kernel.h	Thu Nov 30 23:38:17 2006 -0500
+++ b/fs/ecryptfs/ecryptfs_kernel.h	Thu Nov 30 23:41:32 2006 -0500
@@@@ -28,6 +28,7 @@@@
 
 #include <keys/user-type.h>
 #include <linux/fs.h>
+#include <linux/fs_stack.h>
 #include <linux/namei.h>
 #include <linux/scatterlist.h>
 
@@@@ -413,9 +414,6 @@@@ int ecryptfs_encode_filename(struct ecry
 			     const char *name, int length,
 			     char **encoded_name);
 struct dentry *ecryptfs_lower_dentry(struct dentry *this_dentry);
-void ecryptfs_copy_attr_atime(struct inode *dest, const struct inode *src);
-void ecryptfs_copy_attr_all(struct inode *dest, const struct inode *src);
-void ecryptfs_copy_inode_size(struct inode *dst, const struct inode *src);
 void ecryptfs_dump_hex(char *data, int bytes);
 int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg,
 			int sg_size);
@


1.1.2.2
log
@Remove git cruft and add 2 patch descriptions
@
text
@a0 9
fsstack: Fix up ecryptfs's fsstack usage

From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

Fix up a stray ecryptfs_copy_attr_all call and remove prototypes for
ecryptfs_copy_* as they no longer exist.

Signed-off-by: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

@


