lkml.org 
[lkml]   [2006]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/35] struct path: make eCryptfs a user of struct path
    Date
    From: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>

    Convert eCryptfs dentry-vfsmount pairs in dentry private data to struct
    path.

    Cc: Michael Halcrow <mhalcrow@us.ibm.com>
    Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
    ---
    fs/ecryptfs/ecryptfs_kernel.h | 12 ++++++------
    1 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
    index f992533..870a65b 100644
    --- a/fs/ecryptfs/ecryptfs_kernel.h
    +++ b/fs/ecryptfs/ecryptfs_kernel.h
    @@ -28,6 +28,7 @@

    #include <keys/user-type.h>
    #include <linux/fs.h>
    +#include <linux/namei.h>
    #include <linux/scatterlist.h>

    /* Version verification for shared data structures w/ userspace */
    @@ -227,8 +228,7 @@ struct ecryptfs_inode_info {
    /* dentry private data. Each dentry must keep track of a lower
    * vfsmount too. */
    struct ecryptfs_dentry_info {
    - struct dentry *wdi_dentry;
    - struct vfsmount *lower_mnt;
    + struct path lower_path;
    struct ecryptfs_crypt_stat *crypt_stat;
    };

    @@ -355,26 +355,26 @@ ecryptfs_set_dentry_private(struct dentr
    static inline struct dentry *
    ecryptfs_dentry_to_lower(struct dentry *dentry)
    {
    - return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->wdi_dentry;
    + return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.dentry;
    }

    static inline void
    ecryptfs_set_dentry_lower(struct dentry *dentry, struct dentry *lower_dentry)
    {
    - ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->wdi_dentry =
    + ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.dentry =
    lower_dentry;
    }

    static inline struct vfsmount *
    ecryptfs_dentry_to_lower_mnt(struct dentry *dentry)
    {
    - return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_mnt;
    + return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.mnt;
    }

    static inline void
    ecryptfs_set_dentry_lower_mnt(struct dentry *dentry, struct vfsmount *lower_mnt)
    {
    - ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_mnt =
    + ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.mnt =
    lower_mnt;
    }

    --
    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/

    \
     
     \ /
      Last update: 2006-12-04 13:47    [W:4.682 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site