diff options
author | Mike Snitzer <snitzer@redhat.com> | 2015-05-29 14:17:16 -0400 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2015-05-29 14:17:16 -0400 |
commit | 183f7802e73e26206558864d1b67e64382257277 (patch) | |
tree | b380d7a8db726e7839f50fa07d3f1a1e80589ec3 /include/uapi/linux | |
parent | 1c220c69ce0dcc0f234a9f263ad9c0864f971852 (diff) | |
parent | f6454b049d81bb3d732b6a8afde08420589c6af9 (diff) | |
download | op-kernel-dev-183f7802e73e26206558864d1b67e64382257277.zip op-kernel-dev-183f7802e73e26206558864d1b67e64382257277.tar.gz |
Merge remote-tracking branch 'jens/for-4.2/core' into dm-4.2
Diffstat (limited to 'include/uapi/linux')
-rw-r--r-- | include/uapi/linux/nbd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/uapi/linux/nbd.h b/include/uapi/linux/nbd.h index 4f52549..e08e413 100644 --- a/include/uapi/linux/nbd.h +++ b/include/uapi/linux/nbd.h @@ -44,8 +44,6 @@ enum { /* there is a gap here to match userspace */ #define NBD_FLAG_SEND_TRIM (1 << 5) /* send trim/discard */ -#define nbd_cmd(req) ((req)->cmd[0]) - /* userspace doesn't need the nbd_device structure */ /* These are sent over the network in the request/reply magic fields */ |