Commit de757558 authored by Linus Torvalds's avatar Linus Torvalds

Mark the sunrpc cache control file nonseekable, and

remove the run-time tests for it.
parent 2eca58ca
...@@ -582,9 +582,6 @@ cache_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos) ...@@ -582,9 +582,6 @@ cache_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
struct cache_detail *cd = PDE(filp->f_dentry->d_inode)->data; struct cache_detail *cd = PDE(filp->f_dentry->d_inode)->data;
int err; int err;
if (ppos != &filp->f_pos)
return -ESPIPE;
if (count == 0) if (count == 0)
return 0; return 0;
...@@ -662,9 +659,6 @@ cache_write(struct file *filp, const char __user *buf, size_t count, ...@@ -662,9 +659,6 @@ cache_write(struct file *filp, const char __user *buf, size_t count,
int err; int err;
struct cache_detail *cd = PDE(filp->f_dentry->d_inode)->data; struct cache_detail *cd = PDE(filp->f_dentry->d_inode)->data;
if (ppos != &filp->f_pos)
return -ESPIPE;
if (count == 0) if (count == 0)
return 0; return 0;
if (count >= sizeof(write_buf)) if (count >= sizeof(write_buf))
...@@ -751,6 +745,7 @@ cache_open(struct inode *inode, struct file *filp) ...@@ -751,6 +745,7 @@ cache_open(struct inode *inode, struct file *filp)
{ {
struct cache_reader *rp = NULL; struct cache_reader *rp = NULL;
nonseekable_open(inode, filp);
if (filp->f_mode & FMODE_READ) { if (filp->f_mode & FMODE_READ) {
struct cache_detail *cd = PDE(inode)->data; struct cache_detail *cd = PDE(inode)->data;
...@@ -1212,6 +1207,7 @@ static ssize_t write_flush(struct file * file, const char __user * buf, ...@@ -1212,6 +1207,7 @@ static ssize_t write_flush(struct file * file, const char __user * buf,
} }
static struct file_operations cache_flush_operations = { static struct file_operations cache_flush_operations = {
.open = nonseekable_open,
.read = read_flush, .read = read_flush,
.write = write_flush, .write = write_flush,
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment