diff options
Diffstat (limited to 'fs/fifo.c')
-rw-r--r-- | fs/fifo.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -57,7 +57,7 @@ static int fifo_open(struct inode *inode, struct file *filp) | |||
57 | * POSIX.1 says that O_NONBLOCK means return with the FIFO | 57 | * POSIX.1 says that O_NONBLOCK means return with the FIFO |
58 | * opened, even when there is no process writing the FIFO. | 58 | * opened, even when there is no process writing the FIFO. |
59 | */ | 59 | */ |
60 | filp->f_op = &read_fifo_fops; | 60 | filp->f_op = &read_pipefifo_fops; |
61 | pipe->r_counter++; | 61 | pipe->r_counter++; |
62 | if (pipe->readers++ == 0) | 62 | if (pipe->readers++ == 0) |
63 | wake_up_partner(inode); | 63 | wake_up_partner(inode); |
@@ -86,7 +86,7 @@ static int fifo_open(struct inode *inode, struct file *filp) | |||
86 | if ((filp->f_flags & O_NONBLOCK) && !pipe->readers) | 86 | if ((filp->f_flags & O_NONBLOCK) && !pipe->readers) |
87 | goto err; | 87 | goto err; |
88 | 88 | ||
89 | filp->f_op = &write_fifo_fops; | 89 | filp->f_op = &write_pipefifo_fops; |
90 | pipe->w_counter++; | 90 | pipe->w_counter++; |
91 | if (!pipe->writers++) | 91 | if (!pipe->writers++) |
92 | wake_up_partner(inode); | 92 | wake_up_partner(inode); |
@@ -105,7 +105,7 @@ static int fifo_open(struct inode *inode, struct file *filp) | |||
105 | * This implementation will NEVER block on a O_RDWR open, since | 105 | * This implementation will NEVER block on a O_RDWR open, since |
106 | * the process can at least talk to itself. | 106 | * the process can at least talk to itself. |
107 | */ | 107 | */ |
108 | filp->f_op = &rdwr_fifo_fops; | 108 | filp->f_op = &rdwr_pipefifo_fops; |
109 | 109 | ||
110 | pipe->readers++; | 110 | pipe->readers++; |
111 | pipe->writers++; | 111 | pipe->writers++; |
@@ -151,5 +151,5 @@ err_nocleanup: | |||
151 | * depending on the access mode of the file... | 151 | * depending on the access mode of the file... |
152 | */ | 152 | */ |
153 | const struct file_operations def_fifo_fops = { | 153 | const struct file_operations def_fifo_fops = { |
154 | .open = fifo_open, /* will set read or write pipe_fops */ | 154 | .open = fifo_open, /* will set read_ or write_pipefifo_fops */ |
155 | }; | 155 | }; |