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-3068 build: fix 'incorrect expression' errors
[fs/lustre-release.git]
/
lustre
/
obdclass
/
genops.c
diff --git
a/lustre/obdclass/genops.c
b/lustre/obdclass/genops.c
index
cd1443c
..
436aa4d
100644
(file)
--- a/
lustre/obdclass/genops.c
+++ b/
lustre/obdclass/genops.c
@@
-315,8
+315,7
@@
struct obd_device *class_newdev(const char *type_name, const char *name)
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd = class_num2obd(i);
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd = class_num2obd(i);
- if (obd && obd->obd_name &&
- (strcmp(name, obd->obd_name) == 0)) {
+ if (obd && (strcmp(name, obd->obd_name) == 0)) {
CERROR("Device %s already exists at %d, won't add\n",
name, i);
if (result) {
CERROR("Device %s already exists at %d, won't add\n",
name, i);
if (result) {
@@
-397,7
+396,7
@@
int class_name2dev(const char *name)
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd = class_num2obd(i);
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd = class_num2obd(i);
-
if (obd && obd->obd_name
&& strcmp(name, obd->obd_name) == 0) {
+
if (obd
&& strcmp(name, obd->obd_name) == 0) {
/* Make sure we finished attaching before we give
out any references */
LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
/* Make sure we finished attaching before we give
out any references */
LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);