Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936317AbWLDMfO (ORCPT ); Mon, 4 Dec 2006 07:35:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S936314AbWLDMfN (ORCPT ); Mon, 4 Dec 2006 07:35:13 -0500 Received: from filer.fsl.cs.sunysb.edu ([130.245.126.2]:47838 "EHLO filer.fsl.cs.sunysb.edu") by vger.kernel.org with ESMTP id S936286AbWLDMek (ORCPT ); Mon, 4 Dec 2006 07:34:40 -0500 From: "Josef 'Jeff' Sipek" To: linux-kernel@vger.kernel.org Cc: torvalds@osdl.org, akpm@osdl.org, hch@infradead.org, viro@ftp.linux.org.uk, linux-fsdevel@vger.kernel.org, mhalcrow@us.ibm.com, Josef "Jeff" Sipek Subject: [PATCH 04/35] fsstack: Fix up eCryptfs compilation Date: Mon, 4 Dec 2006 07:30:37 -0500 Message-Id: <11652354693402-git-send-email-jsipek@cs.sunysb.edu> X-Mailer: git-send-email 1.4.3.3 In-Reply-To: <1165235468365-git-send-email-jsipek@cs.sunysb.edu> References: <1165235468365-git-send-email-jsipek@cs.sunysb.edu> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1968 Lines: 57 From: Josef "Jeff" Sipek The fsstack tidy patch broke eCryptfs. This patch makes eCryptfs compile again. Signed-off-by: Josef "Jeff" Sipek --- fs/ecryptfs/inode.c | 6 +++--- fs/ecryptfs/main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 3e2a786..d798d9f 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -589,9 +589,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->d_parent); @@ -878,7 +878,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 --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 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.4.3.3 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/