diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
| commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
| tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /fs/ecryptfs/dentry.c | |
| parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
| parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/ecryptfs/dentry.c')
| -rw-r--r-- | fs/ecryptfs/dentry.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ecryptfs/dentry.c b/fs/ecryptfs/dentry.c index cb20b964419f..841a032050a7 100644 --- a/fs/ecryptfs/dentry.c +++ b/fs/ecryptfs/dentry.c | |||
| @@ -51,13 +51,13 @@ static int ecryptfs_d_revalidate(struct dentry *dentry, struct nameidata *nd) | |||
| 51 | 51 | ||
| 52 | if (!lower_dentry->d_op || !lower_dentry->d_op->d_revalidate) | 52 | if (!lower_dentry->d_op || !lower_dentry->d_op->d_revalidate) |
| 53 | goto out; | 53 | goto out; |
| 54 | dentry_save = nd->dentry; | 54 | dentry_save = nd->path.dentry; |
| 55 | vfsmount_save = nd->mnt; | 55 | vfsmount_save = nd->path.mnt; |
| 56 | nd->dentry = lower_dentry; | 56 | nd->path.dentry = lower_dentry; |
| 57 | nd->mnt = lower_mnt; | 57 | nd->path.mnt = lower_mnt; |
| 58 | rc = lower_dentry->d_op->d_revalidate(lower_dentry, nd); | 58 | rc = lower_dentry->d_op->d_revalidate(lower_dentry, nd); |
| 59 | nd->dentry = dentry_save; | 59 | nd->path.dentry = dentry_save; |
| 60 | nd->mnt = vfsmount_save; | 60 | nd->path.mnt = vfsmount_save; |
| 61 | if (dentry->d_inode) { | 61 | if (dentry->d_inode) { |
| 62 | struct inode *lower_inode = | 62 | struct inode *lower_inode = |
| 63 | ecryptfs_inode_to_lower(dentry->d_inode); | 63 | ecryptfs_inode_to_lower(dentry->d_inode); |