Module: xenomai-forge
Branch: next
Commit: ec7553800fd7f89914c073bcf7871f59eec60194
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=ec7553800fd7f89914c073bcf7871f59eec60194

Author: Jan Kiszka <jan.kis...@siemens.com>
Date:   Wed Aug 21 10:01:57 2013 +0200

cobalt/vfile: Remove obsolete parent field from xnvfile

It's no longer used.

Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>

---

 include/cobalt/kernel/vfile.h |    3 ---
 kernel/cobalt/vfile.c         |    5 -----
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/include/cobalt/kernel/vfile.h b/include/cobalt/kernel/vfile.h
index 9f2e5ad..cca1f77 100644
--- a/include/cobalt/kernel/vfile.h
+++ b/include/cobalt/kernel/vfile.h
@@ -41,7 +41,6 @@ struct xnvfile_lock_ops;
 struct xnvfile {
        struct proc_dir_entry *pde;
        struct file *file;
-       struct xnvfile_directory *parent;
        struct xnvfile_lock_ops *lockops;
        int refcnt;
        void *private;
@@ -572,7 +571,6 @@ static inline void xnvfile_touch(struct xnvfile_snapshot 
*vfile)
 #define xnvfile_noentry                        \
        {                               \
                .pde = NULL,            \
-               .parent = NULL,         \
                .private = NULL,        \
                .file = NULL,           \
                .refcnt = 0,            \
@@ -582,7 +580,6 @@ static inline void xnvfile_touch(struct xnvfile_snapshot 
*vfile)
 #define xnvfile_nolink { .entry = xnvfile_noentry }
 #define xnvfile_nofile { .entry = xnvfile_noentry }
 
-#define xnvfile_parent(e)              ((e)->entry.parent)
 #define xnvfile_priv(e)                        ((e)->entry.private)
 #define xnvfile_nref(e)                        ((e)->entry.refcnt)
 #define xnvfile_file(e)                        ((e)->entry.file)
diff --git a/kernel/cobalt/vfile.c b/kernel/cobalt/vfile.c
index f7e1bdf..84025e4 100644
--- a/kernel/cobalt/vfile.c
+++ b/kernel/cobalt/vfile.c
@@ -419,7 +419,6 @@ int xnvfile_init_snapshot(const char *name,
        if (pde == NULL)
                return -ENOMEM;
 
-       vfile->entry.parent = parent;
        vfile->entry.pde = pde;
 
        return 0;
@@ -652,7 +651,6 @@ int xnvfile_init_regular(const char *name,
        if (pde == NULL)
                return -ENOMEM;
 
-       vfile->entry.parent = parent;
        vfile->entry.pde = pde;
 
        return 0;
@@ -693,7 +691,6 @@ int xnvfile_init_dir(const char *name,
        if (pde == NULL)
                return -ENOMEM;
 
-       vdir->entry.parent = parent;
        vdir->entry.pde = pde;
        vdir->entry.lockops = NULL;
        vdir->entry.private = NULL;
@@ -740,7 +737,6 @@ int xnvfile_init_link(const char *from,
        if (pde == NULL)
                return -ENOMEM;
 
-       vlink->entry.parent = parent;
        vlink->entry.pde = pde;
        vlink->entry.lockops = NULL;
        vlink->entry.private = NULL;
@@ -958,7 +954,6 @@ int __init xnvfile_init_root(void)
        if (pde == NULL)
                return -ENOMEM;
 
-       vdir->entry.parent = NULL;
        vdir->entry.pde = pde;
        vdir->entry.lockops = NULL;
        vdir->entry.private = NULL;


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to