From: "Josef 'Jeff' Sipek" <jsipek@cs.sunysb.edu>
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 <jsipek@cs.sunysb.edu>
Subject: [PATCH 04/35] fsstack: Fix up eCryptfs compilation
Date: Mon, 4 Dec 2006 07:30:37 -0500 [thread overview]
Message-ID: <11652354693402-git-send-email-jsipek@cs.sunysb.edu> (raw)
In-Reply-To: <1165235468365-git-send-email-jsipek@cs.sunysb.edu>
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>
---
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
next prev parent reply other threads:[~2006-12-04 12:30 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-04 12:30 Unionfs: Stackable namespace unification filesystem Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 01/35] fsstack: Introduce fsstack_copy_{attr,inode}_* Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 02/35] fsstack: Remove unneeded wrapper Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 03/35] eCryptfs: Use fsstack's generic copy inode attr functions Josef 'Jeff' Sipek
2006-12-04 12:30 ` Josef 'Jeff' Sipek [this message]
2006-12-04 12:30 ` [PATCH 05/35] struct path: Rename Reiserfs's struct path Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 06/35] struct path: Rename DM's " Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 07/35] struct path: Move struct path from fs/namei.c into include/linux Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 08/35] struct path: make eCryptfs a user of struct path Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 09/35] fs/stack.c should #include <linux/fs_stack.h> Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 10/35] fsstack: Make fsstack_copy_attr_all copy inode size Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 11/35] fsstack: Fix up ecryptfs's fsstack usage Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 12/35] Unionfs: Documentation Josef 'Jeff' Sipek
2006-12-05 20:52 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 13/35] lookup_one_len_nd - lookup_one_len with nameidata argument Josef 'Jeff' Sipek
2006-12-05 20:53 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 14/35] Unionfs: Branch management functionality Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 15/35] Unionfs: Common file operations Josef 'Jeff' Sipek
2006-12-05 21:02 ` Jan Engelhardt
2006-12-08 4:16 ` Josef Sipek
2006-12-08 10:51 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 16/35] Unionfs: Copyup Functionality Josef 'Jeff' Sipek
2006-12-05 21:09 ` Jan Engelhardt
2006-12-08 4:43 ` Josef Sipek
2006-12-04 12:30 ` [PATCH 17/35] Unionfs: Dentry operations Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 18/35] Unionfs: File operations Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 19/35] Unionfs: Directory file operations Josef 'Jeff' Sipek
2006-12-05 21:17 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 20/35] Unionfs: Directory manipulation helper functions Josef 'Jeff' Sipek
2006-12-05 21:21 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 21/35] Unionfs: Inode operations Josef 'Jeff' Sipek
2006-12-05 21:27 ` Jan Engelhardt
2006-12-05 21:50 ` Andrew Morton
2006-12-05 21:53 ` David Miller
2006-12-06 4:12 ` Randy Dunlap
2006-12-07 14:04 ` Theodore Tso
2006-12-07 17:07 ` Andrew Morton
2006-12-07 22:42 ` Randy Dunlap
2006-12-04 12:30 ` [PATCH 22/35] Unionfs: Lookup helper functions Josef 'Jeff' Sipek
2006-12-05 21:29 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 23/35] Unionfs: Main module functions Josef 'Jeff' Sipek
2006-12-05 21:32 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 24/35] Unionfs: Readdir state Josef 'Jeff' Sipek
2006-12-05 21:40 ` Jan Engelhardt
2006-12-04 12:30 ` [PATCH 25/35] Unionfs: Rename Josef 'Jeff' Sipek
2006-12-04 12:30 ` [PATCH 26/35] Unionfs: Privileged operations workqueue Josef 'Jeff' Sipek
2006-12-05 19:27 ` Jan Engelhardt
2006-12-05 19:50 ` Josef Sipek
2006-12-06 17:32 ` Josef Sipek
2006-12-06 18:46 ` Jan Engelhardt
2006-12-08 2:17 ` Josef Sipek
2006-12-08 10:38 ` Jan Engelhardt
2006-12-08 16:00 ` Josef Sipek
2006-12-08 17:02 ` Jan Engelhardt
2006-12-08 17:43 ` Josef Sipek
2006-12-08 18:03 ` Jan Engelhardt
2006-12-08 18:24 ` Josef Sipek
2006-12-04 12:31 ` [PATCH 27/35] Unionfs: Handling of stale inodes Josef 'Jeff' Sipek
2006-12-04 12:31 ` [PATCH 28/35] Unionfs: Miscellaneous helper functions Josef 'Jeff' Sipek
2006-12-04 12:31 ` [PATCH 29/35] Unionfs: Superblock operations Josef 'Jeff' Sipek
2006-12-07 10:59 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 30/35] Unionfs: Helper macros/inlines Josef 'Jeff' Sipek
2006-12-07 11:00 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 31/35] Unionfs: Internal include file Josef 'Jeff' Sipek
2006-12-05 19:41 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 32/35] Unionfs: Include file Josef 'Jeff' Sipek
2006-12-07 11:01 ` Jan Engelhardt
2006-12-04 12:31 ` [PATCH 33/35] Unionfs: Unlink Josef 'Jeff' Sipek
2006-12-04 12:31 ` [PATCH 34/35] Unionfs: Kconfig and Makefile Josef 'Jeff' Sipek
2006-12-04 12:31 ` [PATCH 35/35] Unionfs: Extended Attributes support Josef 'Jeff' Sipek
2006-12-07 11:04 ` Jan Engelhardt
2006-12-08 5:35 ` Josef Sipek
2006-12-08 10:53 ` Jan Engelhardt
2006-12-05 15:13 ` Unionfs: Stackable namespace unification filesystem Josef Sipek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11652354693402-git-send-email-jsipek@cs.sunysb.edu \
--to=jsipek@cs.sunysb.edu \
--cc=akpm@osdl.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhalcrow@us.ibm.com \
--cc=torvalds@osdl.org \
--cc=viro@ftp.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).