diff options
| -rw-r--r-- | fs/ringbuffer.c | 8 | ||||
| -rw-r--r-- | include/uapi/linux/ringbuffer_sys.h | 4 | ||||
| -rw-r--r-- | tools/ringbuffer/ringbuffer-test.c | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/fs/ringbuffer.c b/fs/ringbuffer.c index 8ba84fe299ae..88fc8504af96 100644 --- a/fs/ringbuffer.c +++ b/fs/ringbuffer.c @@ -33,7 +33,7 @@ struct ringbuffer { u32 mask; /* size - 1 */ unsigned order; wait_queue_head_t wait[2]; - struct ringbuffer_ptrs *ptrs; + struct ringbuffer_desc *ptrs; void *data; /* hidden internal file for the mmap */ struct file *rb_file; @@ -344,8 +344,8 @@ static void ringbuffer_futex_key(struct ringbuffer *rb, int rw, key->shared.i_seq = get_inode_sequence_number(inode); key->shared.pgoff = (1U << rb->order) - 1; key->shared.offset = rw == READ - ? offsetof(struct ringbuffer_ptrs, head) - : offsetof(struct ringbuffer_ptrs, tail); + ? offsetof(struct ringbuffer_desc, head) + : offsetof(struct ringbuffer_desc, tail); } ssize_t ringbuffer_read_iter(struct ringbuffer *rb, struct iov_iter *iter, bool nonblocking) @@ -441,7 +441,7 @@ SYSCALL_DEFINE2(ringbuffer_wait, unsigned, fd, int, rw) goto err; } - struct ringbuffer_ptrs *rp = rb->ptrs; + struct ringbuffer_desc *rp = rb->ptrs; wait_event(rb->wait[rw], rw == READ ? rp->head != rp->tail : rp->head - rp->tail < rb->size); diff --git a/include/uapi/linux/ringbuffer_sys.h b/include/uapi/linux/ringbuffer_sys.h index a7afe8647cc1..f3395c053c2c 100644 --- a/include/uapi/linux/ringbuffer_sys.h +++ b/include/uapi/linux/ringbuffer_sys.h @@ -5,10 +5,10 @@ #include <uapi/linux/types.h> /* - * ringbuffer_ptrs - head and tail pointers for a ringbuffer, mappped to + * ringbuffer_desc - head and tail pointers for a ringbuffer, mappped to * userspace: */ -struct ringbuffer_ptrs { +struct ringbuffer_desc { /* * We use u32s because this type is shared between the kernel and * userspace - ulong/size_t won't work here, we might be 32bit userland diff --git a/tools/ringbuffer/ringbuffer-test.c b/tools/ringbuffer/ringbuffer-test.c index 0fba99e40858..92ea4c520f52 100644 --- a/tools/ringbuffer/ringbuffer-test.c +++ b/tools/ringbuffer/ringbuffer-test.c @@ -22,7 +22,7 @@ typedef uint32_t u32; typedef unsigned long ulong; -static inline struct ringbuffer_ptrs *ringbuffer(int fd, int rw, u32 size) +static inline struct ringbuffer_desc *ringbuffer(int fd, int rw, u32 size) { ulong addr = 0; int ret = syscall(463, fd, rw, size, &addr); @@ -41,7 +41,7 @@ static inline int ringbuffer_wakeup(int fd, int rw) return syscall(465, fd, rw); } -static ssize_t ringbuffer_read(int fd, struct ringbuffer_ptrs *rb, +static ssize_t ringbuffer_read(int fd, struct ringbuffer_desc *rb, void *buf, size_t len) { void *rb_data = (void *) rb + rb->data_offset; @@ -73,7 +73,7 @@ static ssize_t ringbuffer_read(int fd, struct ringbuffer_ptrs *rb, return tail - orig_tail; } -static ssize_t ringbuffer_write(int fd, struct ringbuffer_ptrs *rb, +static ssize_t ringbuffer_write(int fd, struct ringbuffer_desc *rb, void *buf, size_t len) { void *rb_data = (void *) rb + rb->data_offset; @@ -116,7 +116,7 @@ static void usage(void) " -h, --help Display this help and exit\n"); } -static inline ssize_t rb_test_read(int fd, struct ringbuffer_ptrs *rb, +static inline ssize_t rb_test_read(int fd, struct ringbuffer_desc *rb, void *buf, size_t len) { return rb @@ -124,7 +124,7 @@ static inline ssize_t rb_test_read(int fd, struct ringbuffer_ptrs *rb, : read(fd, buf, len); } -static inline ssize_t rb_test_write(int fd, struct ringbuffer_ptrs *rb, +static inline ssize_t rb_test_write(int fd, struct ringbuffer_desc *rb, void *buf, size_t len) { return rb @@ -182,7 +182,7 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - struct ringbuffer_ptrs *rb = NULL; + struct ringbuffer_desc *rb = NULL; if (use_ringbuffer) { rb = ringbuffer(fd, rw, 4096); if (!rb) { |