lkml.org 
[lkml]   [2006]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2] fsstack: Fix up ecryptfs's fsstack usage
    Fix up a stray ecryptfs_copy_attr_all call and remove prototypes for
    ecryptfs_copy_* as they no longer exist.

    Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
    ---
    fs/ecryptfs/dentry.c | 2 +-
    fs/ecryptfs/ecryptfs_kernel.h | 4 +---
    2 files changed, 2 insertions(+), 4 deletions(-)

    diff --git a/fs/ecryptfs/dentry.c b/fs/ecryptfs/dentry.c
    index 52d1e36..b0352d8 100644
    --- a/fs/ecryptfs/dentry.c
    +++ b/fs/ecryptfs/dentry.c
    @@ -61,7 +61,7 @@ static int ecryptfs_d_revalidate(struct
    struct inode *lower_inode =
    ecryptfs_inode_to_lower(dentry->d_inode);

    - ecryptfs_copy_attr_all(dentry->d_inode, lower_inode);
    + fsstack_copy_attr_all(dentry->d_inode, lower_inode, NULL);
    }
    out:
    return rc;
    diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
    index 870a65b..afb64bd 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/fs_stack.h>
    #include <linux/namei.h>
    #include <linux/scatterlist.h>

    @@ -413,9 +414,6 @@ int ecryptfs_encode_filename(struct ecry
    const char *name, int length,
    char **encoded_name);
    struct dentry *ecryptfs_lower_dentry(struct dentry *this_dentry);
    -void ecryptfs_copy_attr_atime(struct inode *dest, const struct inode *src);
    -void ecryptfs_copy_attr_all(struct inode *dest, const struct inode *src);
    -void ecryptfs_copy_inode_size(struct inode *dst, const struct inode *src);
    void ecryptfs_dump_hex(char *data, int bytes);
    int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg,
    int sg_size);
    --
    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-05 20:25    [W:0.022 / U:1.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site