Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2a6b64b
)
- make liblustre build.
author
yury
<yury>
Fri, 21 Jul 2006 12:40:15 +0000
(12:40 +0000)
committer
yury
<yury>
Fri, 21 Jul 2006 12:40:15 +0000
(12:40 +0000)
lustre/fld/fld_request.c
patch
|
blob
|
history
lustre/mdc/mdc_locks.c
patch
|
blob
|
history
diff --git
a/lustre/fld/fld_request.c
b/lustre/fld/fld_request.c
index
50ce950
..
e59fe50
100644
(file)
--- a/
lustre/fld/fld_request.c
+++ b/
lustre/fld/fld_request.c
@@
-64,7
+64,7
@@
fld_rrb_hash(struct lu_client_fld *fld, seqno_t seq)
static int
fld_dht_hash(struct lu_client_fld *fld, seqno_t seq)
{
static int
fld_dht_hash(struct lu_client_fld *fld, seqno_t seq)
{
- /* XXX: here should DHT hash */
+ /* XXX: here should
be
DHT hash */
return fld_rrb_hash(fld, seq);
}
return fld_rrb_hash(fld, seq);
}
diff --git
a/lustre/mdc/mdc_locks.c
b/lustre/mdc/mdc_locks.c
index
060680d
..
d1d967e
100644
(file)
--- a/
lustre/mdc/mdc_locks.c
+++ b/
lustre/mdc/mdc_locks.c
@@
-147,13
+147,16
@@
int mdc_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data)
#endif
}
#endif
#endif
}
#endif
+
+#ifdef __KERNEL__
{
{
- /* This is debug code by huanghua. Please remove this when ready */
+
/* This is debug code by huanghua. Please remove this when ready */
struct inode *new_inode = data;
CERROR("XXX: I am going to set lockh : "LPX64" to %p/%lu/%u\n",
((struct lustre_handle *)lockh)->cookie,
new_inode, new_inode->i_ino, new_inode->i_generation);
}
struct inode *new_inode = data;
CERROR("XXX: I am going to set lockh : "LPX64" to %p/%lu/%u\n",
((struct lustre_handle *)lockh)->cookie,
new_inode, new_inode->i_ino, new_inode->i_generation);
}
+#endif
lock->l_ast_data = data;
l_unlock(&lock->l_resource->lr_namespace->ns_lock);
LDLM_LOCK_PUT(lock);
lock->l_ast_data = data;
l_unlock(&lock->l_resource->lr_namespace->ns_lock);
LDLM_LOCK_PUT(lock);