Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 264803
b: refs/heads/master
c: 1d273b9
h: refs/heads/master
i:
  264801: d8e23d9
  264799: 7db8b71
v: v3
  • Loading branch information
Joe Perches authored and Jiri Kosina committed Sep 15, 2011
1 parent dfab8a8 commit 07833ec
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3dbd4439837f2cfd2ff302897353f4b1b6263b2a
refs/heads/master: 1d273b929cad7b1ee95d5c15ac806b3abc764278
2 changes: 1 addition & 1 deletion trunk/drivers/block/drbd/drbd_int.h
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ struct drbd_md {
#define NL_INT64(pn,pr,member) __u64 member;
#define NL_BIT(pn,pr,member) unsigned member:1;
#define NL_STRING(pn,pr,member,len) unsigned char member[len]; int member ## _len;
#include "linux/drbd_nl.h"
#include <linux/drbd_nl.h>

struct drbd_backing_dev {
struct block_device *backing_bdev;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/block/drbd/drbd_nl.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static int name ## _from_tags(struct drbd_conf *mdev, \
arg->member ## _len = dlen; \
memcpy(arg->member, tags, min_t(size_t, dlen, len)); \
break;
#include "linux/drbd_nl.h"
#include <linux/drbd_nl.h>

/* Generate the struct to tag_list functions */
#define NL_PACKET(name, number, fields) \
Expand Down Expand Up @@ -129,7 +129,7 @@ name ## _to_tags(struct drbd_conf *mdev, \
put_unaligned(arg->member ## _len, tags++); \
memcpy(tags, arg->member, arg->member ## _len); \
tags = (unsigned short *)((char *)tags + arg->member ## _len);
#include "linux/drbd_nl.h"
#include <linux/drbd_nl.h>

void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name);
void drbd_nl_send_reply(struct cn_msg *, int);
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/drbd_tag_magic.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ enum packet_types {
#define NL_STRING(pn, pr, member, len) \
unsigned char member[len]; int member ## _len; \
int tag_and_len ## member;
#include "linux/drbd_nl.h"
#include <linux/drbd_nl.h>

/* declare tag-list-sizes */
static const int tag_list_sizes[] = {
Expand Down

0 comments on commit 07833ec

Please sign in to comment.