Module: xenomai-2.6
Branch: master
Commit: 40dbc9cc8c49d916cb7db33b5418b292ae3683e4
URL:    
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=40dbc9cc8c49d916cb7db33b5418b292ae3683e4

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

nucleus: Remove obsolete parent field from xnvfile

It's no longer used.

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

---

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

diff --git a/include/nucleus/vfile.h b/include/nucleus/vfile.h
index c474aaf..38af6b5 100644
--- a/include/nucleus/vfile.h
+++ b/include/nucleus/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;
@@ -577,7 +576,6 @@ static inline void xnvfile_touch(struct xnvfile_snapshot 
*vfile)
 #define xnvfile_noentry                        \
        {                               \
                .pde = NULL,            \
-               .parent = NULL,         \
                .private = NULL,        \
                .file = NULL,           \
                .refcnt = 0,            \
@@ -587,7 +585,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/ksrc/nucleus/vfile.c b/ksrc/nucleus/vfile.c
index 8da3bc7..c8e0363 100644
--- a/ksrc/nucleus/vfile.c
+++ b/ksrc/nucleus/vfile.c
@@ -424,7 +424,6 @@ int xnvfile_init_snapshot(const char *name,
 
        wrap_proc_dir_entry_owner(pde);
 
-       vfile->entry.parent = parent;
        vfile->entry.pde = pde;
 
        return 0;
@@ -658,7 +657,6 @@ int xnvfile_init_regular(const char *name,
 
        wrap_proc_dir_entry_owner(pde);
 
-       vfile->entry.parent = parent;
        vfile->entry.pde = pde;
 
        return 0;
@@ -699,7 +697,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;
@@ -747,7 +744,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;
@@ -964,7 +960,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