Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Land from b_hd_pid to HEAD
[fs/lustre-release.git]
/
lustre
/
include
/
linux
/
lustre_smfs.h
diff --git
a/lustre/include/linux/lustre_smfs.h
b/lustre/include/linux/lustre_smfs.h
index
710569c
..
b51d628
100644
(file)
--- a/
lustre/include/linux/lustre_smfs.h
+++ b/
lustre/include/linux/lustre_smfs.h
@@
-72,7
+72,7
@@
struct mds_kml_pack_info {
int mpi_size[4];
int mpi_total_size;
};
int mpi_size[4];
int mpi_total_size;
};
-typedef int (*smfs_hook_func)(struct inode *inode,
struct dentry
*dentry,
+typedef int (*smfs_hook_func)(struct inode *inode,
void
*dentry,
void *data1, void *data2, int op, void *handle);
struct smfs_hook_ops {
struct list_head smh_list;
void *data1, void *data2, int op, void *handle);
struct smfs_hook_ops {
struct list_head smh_list;
@@
-324,8
+324,10
@@
static inline void post_smfs_inode(struct inode *inode,
static inline void pre_smfs_inode(struct inode *inode,
struct inode *cache_inode)
{
static inline void pre_smfs_inode(struct inode *inode,
struct inode *cache_inode)
{
- if (inode && cache_inode)
- duplicate_inode(cache_inode, inode);
+ if (inode && cache_inode) {
+ cache_inode->i_state = inode->i_state;
+ // duplicate_inode(cache_inode, inode);
+ }
}
/* instantiate a file handle to the cache file */
}
/* instantiate a file handle to the cache file */
@@
-412,15
+414,11
@@
static inline void smfs_free_dentry_name(struct qstr *str)
static inline struct dentry *pre_smfs_dentry(struct dentry *parent_dentry,
struct inode *cache_inode,
static inline struct dentry *pre_smfs_dentry(struct dentry *parent_dentry,
struct inode *cache_inode,
- struct dentry *dentry,
- int *index)
+ struct dentry *dentry)
{
struct dentry *cache_dentry = NULL;
{
struct dentry *cache_dentry = NULL;
- struct qstr name;
- smfs_get_dentry_name_index(dentry, &name, index);
- cache_dentry = d_alloc(parent_dentry, &name);
- smfs_free_dentry_name(&name);
+ cache_dentry = d_alloc(parent_dentry, &dentry->d_name);
if (!cache_dentry)
RETURN(NULL);
if (!parent_dentry)
if (!cache_dentry)
RETURN(NULL);
if (!parent_dentry)