---

yaml --- r: 146373 b: refs/heads/master c: 596397b h: refs/heads/master i: 146371: 0345e66 v: v3
git-mirror · May 1, 2009 · a0eda25 · a0eda25
1 parent f4851df
commit a0eda25
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca0faba0e8ac844dc0279825eb8db876b5962ea5
+refs/heads/master: 596397b77c895d0fa3674f579c94ad5ea88ef01d
diff --git a/trunk/fs/ext4/ext4.h b/trunk/fs/ext4/ext4.h
@@ -1594,6 +1594,7 @@ extern const struct file_operations ext4_file_operations;
 /* namei.c */
 extern const struct inode_operations ext4_dir_inode_operations;
 extern const struct inode_operations ext4_special_inode_operations;
+extern struct dentry *ext4_get_parent(struct dentry *child);
 
 /* symlink.c */
 extern const struct inode_operations ext4_symlink_inode_operations;

diff --git a/trunk/fs/ext4/namei.c b/trunk/fs/ext4/namei.c
@@ -37,7 +37,6 @@
 #include "ext4.h"
 #include "ext4_jbd2.h"
 
-#include "namei.h"
 #include "xattr.h"
 #include "acl.h"
 

diff --git a/trunk/fs/ext4/namei.h b/trunk/fs/ext4/namei.h
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
@@ -46,7 +46,6 @@
 #include "ext4_jbd2.h"
 #include "xattr.h"
 #include "acl.h"
-#include "namei.h"
 #include "group.h"
 
 struct proc_dir_entry *ext4_proc_root;