Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lustre-release
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
debian-packages
lustre-release
Commits
0bf4bc1e
Commit
0bf4bc1e
authored
16 years ago
by
Isaac Huang
Browse files
Options
Downloads
Patches
Plain Diff
- removed trailing spaces.
parent
6b10b6d5
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lnet/klnds/gmlnd/gmlnd.h
+1
-1
1 addition, 1 deletion
lnet/klnds/gmlnd/gmlnd.h
lnet/klnds/gmlnd/gmlnd_cb.c
+3
-3
3 additions, 3 deletions
lnet/klnds/gmlnd/gmlnd_cb.c
lnet/klnds/gmlnd/gmlnd_utils.c
+5
-6
5 additions, 6 deletions
lnet/klnds/gmlnd/gmlnd_utils.c
with
9 additions
and
10 deletions
lnet/klnds/gmlnd/gmlnd.h
+
1
−
1
View file @
0bf4bc1e
...
@@ -176,7 +176,7 @@ typedef struct gmnal_ni {
...
@@ -176,7 +176,7 @@ typedef struct gmnal_ni {
gmnal_tx_t
*
gmni_txs
;
/* all txs */
gmnal_tx_t
*
gmni_txs
;
/* all txs */
gmnal_rx_t
*
gmni_rxs
;
/* all rx descs */
gmnal_rx_t
*
gmni_rxs
;
/* all rx descs */
gmnal_txbuf_t
*
gmni_ltxbs
;
/* all large tx bufs */
gmnal_txbuf_t
*
gmni_ltxbs
;
/* all large tx bufs */
atomic_t
gmni_nthreads
;
/* total # threads */
atomic_t
gmni_nthreads
;
/* total # threads */
gm_alarm_t
gmni_alarm
;
/* alarm to wake caretaker */
gm_alarm_t
gmni_alarm
;
/* alarm to wake caretaker */
int
gmni_shutdown
;
/* tell all threads to exit */
int
gmni_shutdown
;
/* tell all threads to exit */
...
...
This diff is collapsed.
Click to expand it.
lnet/klnds/gmlnd/gmlnd_cb.c
+
3
−
3
View file @
0bf4bc1e
...
@@ -44,7 +44,7 @@ gmnal_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
...
@@ -44,7 +44,7 @@ gmnal_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
LASSERT
(
msg
->
gmm_type
==
GMNAL_MSG_IMMEDIATE
);
LASSERT
(
msg
->
gmm_type
==
GMNAL_MSG_IMMEDIATE
);
LASSERT
(
iov
==
NULL
||
kiov
==
NULL
);
LASSERT
(
iov
==
NULL
||
kiov
==
NULL
);
if
(
rx
->
rx_recv_nob
<
nob
)
{
if
(
rx
->
rx_recv_nob
<
nob
)
{
CERROR
(
"Short message from nid %s: got %d, need %d
\n
"
,
CERROR
(
"Short message from nid %s: got %d, need %d
\n
"
,
libcfs_nid2str
(
msg
->
gmm_srcnid
),
rx
->
rx_recv_nob
,
nob
);
libcfs_nid2str
(
msg
->
gmm_srcnid
),
rx
->
rx_recv_nob
,
nob
);
...
@@ -134,7 +134,7 @@ gmnal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
...
@@ -134,7 +134,7 @@ gmnal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
else
else
lnet_copy_kiov2flat
(
len
,
buffer
,
0
,
lnet_copy_kiov2flat
(
len
,
buffer
,
0
,
niov
,
kiov
,
offset
,
len
);
niov
,
kiov
,
offset
,
len
);
tx
->
tx_msgnob
+=
len
;
tx
->
tx_msgnob
+=
len
;
tx
->
tx_large_nob
=
0
;
tx
->
tx_large_nob
=
0
;
}
else
{
}
else
{
...
@@ -150,7 +150,7 @@ gmnal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
...
@@ -150,7 +150,7 @@ gmnal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
LASSERT
(
tx
->
tx_lntmsg
==
NULL
);
LASSERT
(
tx
->
tx_lntmsg
==
NULL
);
tx
->
tx_lntmsg
=
lntmsg
;
tx
->
tx_lntmsg
=
lntmsg
;
spin_lock
(
&
gmni
->
gmni_tx_lock
);
spin_lock
(
&
gmni
->
gmni_tx_lock
);
list_add_tail
(
&
tx
->
tx_list
,
&
gmni
->
gmni_buf_txq
);
list_add_tail
(
&
tx
->
tx_list
,
&
gmni
->
gmni_buf_txq
);
...
...
This diff is collapsed.
Click to expand it.
lnet/klnds/gmlnd/gmlnd_utils.c
+
5
−
6
View file @
0bf4bc1e
...
@@ -40,7 +40,6 @@ gmnal_alloc_netbuf_pages (gmnal_ni_t *gmni, gmnal_netbuf_t *nb, int npages)
...
@@ -40,7 +40,6 @@ gmnal_alloc_netbuf_pages (gmnal_ni_t *gmni, gmnal_netbuf_t *nb, int npages)
LASSERT
(
npages
>
0
);
LASSERT
(
npages
>
0
);
for
(
i
=
0
;
i
<
npages
;
i
++
)
{
for
(
i
=
0
;
i
<
npages
;
i
++
)
{
nb
->
nb_kiov
[
i
].
kiov_page
=
alloc_page
(
GFP_KERNEL
);
nb
->
nb_kiov
[
i
].
kiov_page
=
alloc_page
(
GFP_KERNEL
);
nb
->
nb_kiov
[
i
].
kiov_offset
=
0
;
nb
->
nb_kiov
[
i
].
kiov_offset
=
0
;
nb
->
nb_kiov
[
i
].
kiov_len
=
PAGE_SIZE
;
nb
->
nb_kiov
[
i
].
kiov_len
=
PAGE_SIZE
;
...
@@ -70,13 +69,13 @@ gmnal_alloc_netbuf_pages (gmnal_ni_t *gmni, gmnal_netbuf_t *nb, int npages)
...
@@ -70,13 +69,13 @@ gmnal_alloc_netbuf_pages (gmnal_ni_t *gmni, gmnal_netbuf_t *nb, int npages)
gmnal_free_netbuf_pages
(
nb
,
i
+
1
);
gmnal_free_netbuf_pages
(
nb
,
i
+
1
);
return
-
ENOMEM
;
return
-
ENOMEM
;
}
}
if
(
i
==
0
)
if
(
i
==
0
)
nb
->
nb_netaddr
=
gmni
->
gmni_netaddr_base
;
nb
->
nb_netaddr
=
gmni
->
gmni_netaddr_base
;
gmni
->
gmni_netaddr_base
+=
PAGE_SIZE
;
gmni
->
gmni_netaddr_base
+=
PAGE_SIZE
;
}
}
return
0
;
return
0
;
}
}
...
@@ -99,7 +98,7 @@ gmnal_alloc_ltxbuf (gmnal_ni_t *gmni)
...
@@ -99,7 +98,7 @@ gmnal_alloc_ltxbuf (gmnal_ni_t *gmni)
int
sz
=
offsetof
(
gmnal_txbuf_t
,
txb_buf
.
nb_kiov
[
npages
]);
int
sz
=
offsetof
(
gmnal_txbuf_t
,
txb_buf
.
nb_kiov
[
npages
]);
gmnal_txbuf_t
*
txb
;
gmnal_txbuf_t
*
txb
;
int
rc
;
int
rc
;
LIBCFS_ALLOC
(
txb
,
sz
);
LIBCFS_ALLOC
(
txb
,
sz
);
if
(
txb
==
NULL
)
{
if
(
txb
==
NULL
)
{
CERROR
(
"Can't allocate large txbuffer
\n
"
);
CERROR
(
"Can't allocate large txbuffer
\n
"
);
...
@@ -227,7 +226,7 @@ gmnal_alloc_ltxbufs (gmnal_ni_t *gmni)
...
@@ -227,7 +226,7 @@ gmnal_alloc_ltxbufs (gmnal_ni_t *gmni)
for
(
i
=
0
;
i
<
nlarge_tx_bufs
;
i
++
)
{
for
(
i
=
0
;
i
<
nlarge_tx_bufs
;
i
++
)
{
rc
=
gmnal_alloc_ltxbuf
(
gmni
);
rc
=
gmnal_alloc_ltxbuf
(
gmni
);
if
(
rc
!=
0
)
if
(
rc
!=
0
)
return
rc
;
return
rc
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment