redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drbd: new-connection and new-minor succeed, if the object already exists 

Follow O_CREAT semantics when creating connection or minor device/volume
objects.  If we need O_CREAT|O_EXCL semantics some time down the road,
we can add NLM_F_EXCL to the netlink message flags.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
hifive-unleashed-5.1
Lars Ellenberg 2011-03-14 13:22:35 +01:00 committed by Philipp Reisner
parent cffec5b2fe
commit 38f19616d2
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/block/drbd/drbd_nl.c
View File

@ -2590,8 +2590,11 @@ int drbd_adm_create_connection(struct sk_buff *skb, struct genl_info *info)
goto out;
if (adm_ctx.tconn) {
retcode = ERR_INVALID_REQUEST;
drbd_msg_put_info("connection exists");
if (info->nlhdr->nlmsg_flags & NLM_F_EXCL) {
retcode = ERR_INVALID_REQUEST;
drbd_msg_put_info("connection exists");
}
/* else: still NO_ERROR */
goto out;
}
@ -2626,6 +2629,15 @@ int drbd_adm_add_minor(struct sk_buff *skb, struct genl_info *info)
goto out;
}
/* drbd_adm_prepare made sure already
* that mdev->tconn and mdev->vnr match the request. */
if (adm_ctx.mdev) {
if (info->nlhdr->nlmsg_flags & NLM_F_EXCL)
retcode = ERR_MINOR_EXISTS;
/* else: still NO_ERROR */
goto out;
}
retcode = conn_new_minor(adm_ctx.tconn, dh->minor, adm_ctx.volume);
out:
drbd_adm_finish(info, retcode);