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
LU-4524 ldlm: improve ldlm_lock_create() return value
[fs/lustre-release.git]
/
lustre
/
ofd
/
ofd_dev.c
diff --git
a/lustre/ofd/ofd_dev.c
b/lustre/ofd/ofd_dev.c
index
a4928c4
..
f6dbfeb
100644
(file)
--- a/
lustre/ofd/ofd_dev.c
+++ b/
lustre/ofd/ofd_dev.c
@@
-1122,7
+1122,7
@@
out:
* to go... deadlock! */
res = ldlm_resource_get(ofd->ofd_namespace, NULL,
&tsi->tsi_resid, LDLM_EXTENT, 0);
* to go... deadlock! */
res = ldlm_resource_get(ofd->ofd_namespace, NULL,
&tsi->tsi_resid, LDLM_EXTENT, 0);
- if (
res != NULL
) {
+ if (
!IS_ERR(res)
) {
ldlm_res_lvbo_update(res, NULL, 0);
ldlm_resource_putref(res);
}
ldlm_res_lvbo_update(res, NULL, 0);
ldlm_resource_putref(res);
}
@@
-1683,7
+1683,7
@@
out:
* to go... deadlock! */
res = ldlm_resource_get(ns, NULL, &tsi->tsi_resid,
LDLM_EXTENT, 0);
* to go... deadlock! */
res = ldlm_resource_get(ns, NULL, &tsi->tsi_resid,
LDLM_EXTENT, 0);
- if (
res != NULL
) {
+ if (
!IS_ERR(res)
) {
ldlm_res_lvbo_update(res, NULL, 0);
ldlm_resource_putref(res);
}
ldlm_res_lvbo_update(res, NULL, 0);
ldlm_resource_putref(res);
}