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-13581 build: xarray and lockdep_is_held const clash
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
llog_net.c
diff --git
a/lustre/ptlrpc/llog_net.c
b/lustre/ptlrpc/llog_net.c
index
2b09b8d
..
2e9b6a8
100644
(file)
--- a/
lustre/ptlrpc/llog_net.c
+++ b/
lustre/ptlrpc/llog_net.c
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-52,20
+48,21
@@
int llog_initiator_connect(struct llog_ctxt *ctxt)
{
int llog_initiator_connect(struct llog_ctxt *ctxt)
{
- struct obd_import *new_imp;
- ENTRY;
+ struct obd_import *new_imp;
+
+ ENTRY;
-
LASSERT(ctxt);
-
new_imp = ctxt->loc_obd->u.cli.cl_import;
-
LASSERTF(ctxt->loc_imp == NULL
|| ctxt->loc_imp == new_imp,
-
"%p - %p\n", ctxt->loc_imp, new_imp);
+ LASSERT(ctxt);
+ new_imp = ctxt->loc_obd->u.cli.cl_import;
+
LASSERTF(!ctxt->loc_imp
|| ctxt->loc_imp == new_imp,
+ "%p - %p\n", ctxt->loc_imp, new_imp);
mutex_lock(&ctxt->loc_mutex);
mutex_lock(&ctxt->loc_mutex);
-
if (ctxt->loc_imp != new_imp) {
-
if (ctxt->loc_imp)
-
class_import_put(ctxt->loc_imp);
-
ctxt->loc_imp = class_import_get(new_imp);
-
}
+ if (ctxt->loc_imp != new_imp) {
+ if (ctxt->loc_imp)
+ class_import_put(ctxt->loc_imp);
+ ctxt->loc_imp = class_import_get(new_imp);
+ }
mutex_unlock(&ctxt->loc_mutex);
mutex_unlock(&ctxt->loc_mutex);
-
RETURN(0);
+ RETURN(0);
}
EXPORT_SYMBOL(llog_initiator_connect);
}
EXPORT_SYMBOL(llog_initiator_connect);