Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / dir.h

diff --git a/fs/ocfs2/dir.h b/fs/ocfs2/dir.h
index 075d0e9fd459f29280931ef79b7cc58d0beb56e6..ce48b9080d87c8b2a69839b9b33ee8433f2ee786 100644 (file)
--- a/fs/ocfs2/dir.h
+++ b/fs/ocfs2/dir.h
@@ -50,17 +50,22 @@ static inline int ocfs2_add_entry(handle_t *handle,
                                 dentry->d_name.name, dentry->d_name.len,
                                 inode, blkno, parent_fe_bh, insert_bh);
 }
+int ocfs2_update_entry(struct inode *dir, handle_t *handle,
+                      struct buffer_head *de_bh, struct ocfs2_dir_entry *de,
+                      struct inode *new_entry_inode);
 
 int ocfs2_check_dir_for_entry(struct inode *dir,
                              const char *name,
                              int namelen);
-int ocfs2_empty_dir(struct inode *inode);  /* FIXME: to namei.c */
+int ocfs2_empty_dir(struct inode *inode);
 int ocfs2_find_files_on_disk(const char *name,
                             int namelen,
                             u64 *blkno,
                             struct inode *inode,
                             struct buffer_head **dirent_bh,
                             struct ocfs2_dir_entry **dirent);
+int ocfs2_lookup_ino_from_name(struct inode *dir, const char *name,
+                              int namelen, u64 *blkno);
 int ocfs2_readdir(struct file *filp, void *dirent, filldir_t filldir);
 int ocfs2_dir_foreach(struct inode *inode, loff_t *f_pos, void *priv,
                      filldir_t filldir);