On Sat, Feb 17, 2007 at 03:56:55AM -0500, Josef 'Jeff' Sipek wrote:
> From: Michael Halcrow <mhalcrow@xxxxxxxxxx>
>
> Call the new lookup_one_len_nd() rather than lookup_one_len(). This fixes an
> oops when stacked on NFS.
>
> Note that there are still some issues with eCryptfs on NFS having to do with
> directory deletion (I'm not getting an oops, just an -EBUSY).
Biug NACK here. This is just working around the broken lookup intents
code. lookup_one_len still is a hack for some network filesystems that
unfortunately grew a few too many users.
There is a valid case for in-kernel lookups from an arbitrary point,
but lookup_one_len* is the wrong API for this. The righ API for that
is a variant of path?lookup that takes a vfsmount + dentry pair.
Implementing this might be a good idea anyway to clean up the mess
do_path_lookup is currently.
>
> Signed-off-by: Michael Halcrow <mhalcrow@xxxxxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Josef 'Jeff' Sipek <jsipek@xxxxxxxxxxxxx>
> ---
> fs/ecryptfs/inode.c | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
> index 11f5e50..4c3d786 100644
> --- a/fs/ecryptfs/inode.c
> +++ b/fs/ecryptfs/inode.c
> @@ -283,7 +283,9 @@ static struct dentry *ecryptfs_lookup(struct inode *dir, struct dentry *dentry,
> int rc = 0;
> struct dentry *lower_dir_dentry;
> struct dentry *lower_dentry;
> + struct dentry *dentry_save;
> struct vfsmount *lower_mnt;
> + struct vfsmount *mnt_save;
> char *encoded_name;
> unsigned int encoded_namelen;
> struct ecryptfs_crypt_stat *crypt_stat = NULL;
> @@ -310,9 +312,13 @@ static struct dentry *ecryptfs_lookup(struct inode *dir, struct dentry *dentry,
> }
> ecryptfs_printk(KERN_DEBUG, "encoded_name = [%s]; encoded_namelen "
> "= [%d]\n", encoded_name, encoded_namelen);
> - lower_dentry = lookup_one_len(encoded_name, lower_dir_dentry,
> - encoded_namelen - 1);
> + dentry_save = nd->dentry;
> + mnt_save = nd->mnt;
> + lower_dentry = lookup_one_len_nd(encoded_name, lower_dir_dentry,
> + (encoded_namelen - 1), nd);
> kfree(encoded_name);
> + nd->mnt = mnt_save;
> + nd->dentry = dentry_save;
> if (IS_ERR(lower_dentry)) {
> ecryptfs_printk(KERN_ERR, "ERR from lower_dentry\n");
> rc = PTR_ERR(lower_dentry);
> --
> 1.5.0.19.gddff
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
---end quoted text---
-
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
