Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
staging
/
lustre
/
lustre
/
lmv
/
lmv_intent.c
diff --git
a/kernel/drivers/staging/lustre/lustre/lmv/lmv_intent.c
b/kernel/drivers/staging/lustre/lustre/lmv/lmv_intent.c
index
d22d57b
..
eebe45b
100644
(file)
--- a/
kernel/drivers/staging/lustre/lustre/lmv/lmv_intent.c
+++ b/
kernel/drivers/staging/lustre/lustre/lmv/lmv_intent.c
@@
-99,8
+99,8
@@
static int lmv_intent_remote(struct obd_export *exp, void *lmm,
goto out;
}
goto out;
}
-
OBD_ALLOC_PTR(op_data
);
- if (
op_data == NULL
) {
+
op_data = kzalloc(sizeof(*op_data), GFP_NOFS
);
+ if (
!op_data
) {
rc = -ENOMEM;
goto out;
}
rc = -ENOMEM;
goto out;
}
@@
-142,7
+142,7
@@
static int lmv_intent_remote(struct obd_export *exp, void *lmm,
it->d.lustre.it_lock_mode = pmode;
out_free_op_data:
it->d.lustre.it_lock_mode = pmode;
out_free_op_data:
-
OBD_FREE_PTR
(op_data);
+
kfree
(op_data);
out:
if (rc && pmode)
ldlm_lock_decref(&plock, pmode);
out:
if (rc && pmode)
ldlm_lock_decref(&plock, pmode);