diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-20 16:58:09 +0000 | 
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-20 16:58:09 +0000 | 
| commit | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (patch) | |
| tree | 5886a08bfa1132058b06074f4666a36dc5ddd2a1 /fs/pipe.c | |
| parent | 88274815f7477dc7550439413ab87c5ce4c5a623 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/fs/pipe.c b/fs/pipe.c index d722579df79..8aada8e426f 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -605,7 +605,7 @@ struct file_operations rdwr_fifo_fops = {  	.fasync		= pipe_rdwr_fasync,  }; -struct file_operations read_pipe_fops = { +static struct file_operations read_pipe_fops = {  	.llseek		= no_llseek,  	.read		= pipe_read,  	.readv		= pipe_readv, @@ -617,7 +617,7 @@ struct file_operations read_pipe_fops = {  	.fasync		= pipe_read_fasync,  }; -struct file_operations write_pipe_fops = { +static struct file_operations write_pipe_fops = {  	.llseek		= no_llseek,  	.read		= bad_pipe_r,  	.write		= pipe_write, @@ -629,7 +629,7 @@ struct file_operations write_pipe_fops = {  	.fasync		= pipe_write_fasync,  }; -struct file_operations rdwr_pipe_fops = { +static struct file_operations rdwr_pipe_fops = {  	.llseek		= no_llseek,  	.read		= pipe_read,  	.readv		= pipe_readv, | 
