Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
75e7b634
Commit
75e7b634
authored
Nov 26, 2009
by
Jens Axboe
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-jens' of
git://git.drbd.org/linux-2.6-drbd
into for-2.6.33
parents
d9449ce3
35a8a3fd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
10 deletions
+8
-10
drivers/block/drbd/drbd_nl.c
drivers/block/drbd/drbd_nl.c
+1
-1
drivers/block/drbd/drbd_receiver.c
drivers/block/drbd/drbd_receiver.c
+4
-1
include/linux/connector.h
include/linux/connector.h
+2
-0
include/linux/drbd.h
include/linux/drbd.h
+1
-8
No files found.
drivers/block/drbd/drbd_nl.c
View file @
75e7b634
...
@@ -733,7 +733,7 @@ void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_seg_s) __mu
...
@@ -733,7 +733,7 @@ void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_seg_s) __mu
*/
*/
static
void
drbd_reconfig_start
(
struct
drbd_conf
*
mdev
)
static
void
drbd_reconfig_start
(
struct
drbd_conf
*
mdev
)
{
{
wait_event
(
mdev
->
state_wait
,
test_and_set_bit
(
CONFIG_PENDING
,
&
mdev
->
flags
));
wait_event
(
mdev
->
state_wait
,
!
test_and_set_bit
(
CONFIG_PENDING
,
&
mdev
->
flags
));
wait_event
(
mdev
->
state_wait
,
!
test_bit
(
DEVICE_DYING
,
&
mdev
->
flags
));
wait_event
(
mdev
->
state_wait
,
!
test_bit
(
DEVICE_DYING
,
&
mdev
->
flags
));
drbd_thread_start
(
&
mdev
->
worker
);
drbd_thread_start
(
&
mdev
->
worker
);
}
}
...
...
drivers/block/drbd/drbd_receiver.c
View file @
75e7b634
...
@@ -2400,6 +2400,7 @@ static int drbd_uuid_compare(struct drbd_conf *mdev, int *rule_nr) __must_hold(l
...
@@ -2400,6 +2400,7 @@ static int drbd_uuid_compare(struct drbd_conf *mdev, int *rule_nr) __must_hold(l
*
rule_nr
=
80
;
*
rule_nr
=
80
;
peer
=
mdev
->
p_uuid
[
UI_CURRENT
]
&
~
((
u64
)
1
);
for
(
i
=
UI_HISTORY_START
;
i
<=
UI_HISTORY_END
;
i
++
)
{
for
(
i
=
UI_HISTORY_START
;
i
<=
UI_HISTORY_END
;
i
++
)
{
self
=
mdev
->
ldev
->
md
.
uuid
[
i
]
&
~
((
u64
)
1
);
self
=
mdev
->
ldev
->
md
.
uuid
[
i
]
&
~
((
u64
)
1
);
if
(
self
==
peer
)
if
(
self
==
peer
)
...
@@ -3499,8 +3500,10 @@ static void drbdd(struct drbd_conf *mdev)
...
@@ -3499,8 +3500,10 @@ static void drbdd(struct drbd_conf *mdev)
while
(
get_t_state
(
&
mdev
->
receiver
)
==
Running
)
{
while
(
get_t_state
(
&
mdev
->
receiver
)
==
Running
)
{
drbd_thread_current_set_cpu
(
mdev
);
drbd_thread_current_set_cpu
(
mdev
);
if
(
!
drbd_recv_header
(
mdev
,
header
))
if
(
!
drbd_recv_header
(
mdev
,
header
))
{
drbd_force_state
(
mdev
,
NS
(
conn
,
C_PROTOCOL_ERROR
));
break
;
break
;
}
if
(
header
->
command
<
P_MAX_CMD
)
if
(
header
->
command
<
P_MAX_CMD
)
handler
=
drbd_cmd_handler
[
header
->
command
];
handler
=
drbd_cmd_handler
[
header
->
command
];
...
...
include/linux/connector.h
View file @
75e7b634
...
@@ -43,6 +43,8 @@
...
@@ -43,6 +43,8 @@
#define CN_DST_VAL 0x1
#define CN_DST_VAL 0x1
#define CN_IDX_DM 0x7
/* Device Mapper */
#define CN_IDX_DM 0x7
/* Device Mapper */
#define CN_VAL_DM_USERSPACE_LOG 0x1
#define CN_VAL_DM_USERSPACE_LOG 0x1
#define CN_IDX_DRBD 0x8
#define CN_VAL_DRBD 0x1
#define CN_NETLINK_USERS 8
#define CN_NETLINK_USERS 8
...
...
include/linux/drbd.h
View file @
75e7b634
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
extern
const
char
*
drbd_buildtag
(
void
);
extern
const
char
*
drbd_buildtag
(
void
);
#define REL_VERSION "8.3.
5
"
#define REL_VERSION "8.3.
6
"
#define API_VERSION 88
#define API_VERSION 88
#define PRO_VERSION_MIN 86
#define PRO_VERSION_MIN 86
#define PRO_VERSION_MAX 91
#define PRO_VERSION_MAX 91
...
@@ -322,13 +322,6 @@ enum drbd_timeout_flag {
...
@@ -322,13 +322,6 @@ enum drbd_timeout_flag {
#define DRBD_NL_CREATE_DEVICE 0x01
#define DRBD_NL_CREATE_DEVICE 0x01
#define DRBD_NL_SET_DEFAULTS 0x02
#define DRBD_NL_SET_DEFAULTS 0x02
/* The following line should be moved over to linux/connector.h
* when the time comes */
#ifndef CN_IDX_DRBD
# define CN_IDX_DRBD 0x4
/* Ubuntu "intrepid ibex" release defined CN_IDX_DRBD as 0x6 */
#endif
#define CN_VAL_DRBD 0x1
/* For searching a vacant cn_idx value */
/* For searching a vacant cn_idx value */
#define CN_IDX_STEP 6977
#define CN_IDX_STEP 6977
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment