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


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

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

1.1.2.2
date	2006.11.07.06.13.33;	author jsipek;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2006.11.28.08.10.22;	author jsipek;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2006.12.04.08.20.49;	author jsipek;	state Exp;
branches;
next	1.1.2.5;

1.1.2.5
date	2007.01.05.08.33.49;	author jsipek;	state dead;
branches;
next	;


desc
@@


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


1.1.2.1
log
@Move patches already in mm into a subdir
@
text
@a0 45
[-mm] fsstack: Fix up eCryptfs compilation

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

The fsstack tidy patch broke eCryptfs. This patch makes eCryptfs compile
again.

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

diff -r 2187c6b08f02 fs/ecryptfs/inode.c
--- a/fs/ecryptfs/inode.c	Tue Oct 17 18:26:24 2006 -0400
+++ b/fs/ecryptfs/inode.c	Tue Oct 17 18:29:43 2006 -0400
@@@@ -621,9 +621,9 @@@@ ecryptfs_rename(struct inode *old_dir, s
 			lower_new_dir_dentry->d_inode, lower_new_dentry);
 	if (rc)
 		goto out_lock;
-	fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode);
+	fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode, NULL);
 	if (new_dir != old_dir)
-		fsstack_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode);
+		fsstack_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode, NULL);
 out_lock:
 	unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
 	dput(lower_new_dentry);
@@@@ -908,7 +908,7 @@@@ static int ecryptfs_setattr(struct dentr
 	}
 	rc = notify_change(lower_dentry, ia);
 out:
-	fsstack_copy_attr_all(inode, lower_inode);
+	fsstack_copy_attr_all(inode, lower_inode, NULL);
 	return rc;
 }
 
diff -r 2187c6b08f02 fs/ecryptfs/main.c
--- a/fs/ecryptfs/main.c	Tue Oct 17 18:26:24 2006 -0400
+++ b/fs/ecryptfs/main.c	Tue Oct 17 18:31:29 2006 -0400
@@@@ -116,7 +116,7 @@@@ int ecryptfs_interpose(struct dentry *lo
 		d_add(dentry, inode);
 	else
 		d_instantiate(dentry, inode);
-	fsstack_copy_attr_all(inode, lower_inode);
+	fsstack_copy_attr_all(inode, lower_inode, NULL);
 	/* This size will be overwritten for real files w/ headers and
 	 * other metadata */
 	fsstack_copy_inode_size(inode, lower_inode);
@


1.1.2.2
log
@Git generates slightly different diffs - same information, just little
different
@
text
@d10 4
a13 5
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 9af7ed3..346385a 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@@@ -588,9 +588,9 @@@@ ecryptfs_rename(struct inode *old_dir, s
d25 1
a25 1
@@@@ -875,7 +875,7 @@@@ static int ecryptfs_setattr(struct dentr
d34 4
a37 5
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 5982931..a4aee57 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@@@ -113,7 +113,7 @@@@ int ecryptfs_interpose(struct dentry *lo
@


1.1.2.3
log
@Sync up with Linus's tree
@
text
@d12 3
a14 5

diff -r 319988cb8e67 fs/ecryptfs/inode.c
--- a/fs/ecryptfs/inode.c	Tue Nov 28 03:04:14 2006 -0500
+++ b/fs/ecryptfs/inode.c	Tue Nov 28 03:04:43 2006 -0500
@@@@ -589,9 +589,9 @@@@ ecryptfs_rename(struct inode *old_dir, s
d25 2
a26 2
 	dput(lower_new_dentry->d_parent);
@@@@ -878,7 +878,7 @@@@ static int ecryptfs_setattr(struct dentr
d35 4
a38 3
diff -r 319988cb8e67 fs/ecryptfs/main.c
--- a/fs/ecryptfs/main.c	Tue Nov 28 03:04:14 2006 -0500
+++ b/fs/ecryptfs/main.c	Tue Nov 28 03:04:43 2006 -0500
@


1.1.2.4
log
@Git cruft removal
@
text
@d1 1
a1 1
fsstack: Fix up eCryptfs compilation
d9 3
@


1.1.2.5
log
@Removed many patches already in vanilla
@
text
@@


