diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-13 14:45:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-13 14:45:54 +1100 |
| commit | 26a6ee6a68e06162ddd7a1781ad5c14d0a1cd965 (patch) | |
| tree | b74771d004f1f7727c90a1aa5230837503c7ed62 /fs/ocfs2/namei.h | |
| parent | 0000ad4322bb4ae1bb7f307ff562ebcee96b898c (diff) | |
| parent | 833628771769063487eeab6ae24a0e14e2464271 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/arm64/mm/dma-mapping.c
drivers/clk/Kconfig
mm/cma.c
Diffstat (limited to 'fs/ocfs2/namei.h')
| -rw-r--r-- | fs/ocfs2/namei.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/fs/ocfs2/namei.h b/fs/ocfs2/namei.h index e5d059d4f115..c985e357f526 100644 --- a/fs/ocfs2/namei.h +++ b/fs/ocfs2/namei.h @@ -26,10 +26,23 @@ #ifndef OCFS2_NAMEI_H #define OCFS2_NAMEI_H +#include "dir.h" + extern const struct inode_operations ocfs2_dir_iops; struct dentry *ocfs2_get_parent(struct dentry *child); - +int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb, + struct inode **ret_orphan_dir, + u64 blkno, + char *name, + struct ocfs2_dir_lookup_result *lookup); +int ocfs2_orphan_add(struct ocfs2_super *osb, + handle_t *handle, + struct inode *inode, + struct buffer_head *fe_bh, + char *name, + struct ocfs2_dir_lookup_result *lookup, + struct inode *orphan_dir_inode); int ocfs2_orphan_del(struct ocfs2_super *osb, handle_t *handle, struct inode *orphan_dir_inode, @@ -38,6 +51,12 @@ int ocfs2_orphan_del(struct ocfs2_super *osb, int ocfs2_create_inode_in_orphan(struct inode *dir, int mode, struct inode **new_inode); +int ocfs2_add_inode_to_orphan(struct ocfs2_super *osb, + handle_t *handle, + struct inode *inode); +int ocfs2_del_inode_from_orphan(struct ocfs2_super *osb, + handle_t *handle, + struct inode *inode); int ocfs2_mv_orphaned_inode_to_new(struct inode *dir, struct inode *new_inode, struct dentry *new_dentry); |