diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-01 10:59:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-01 10:59:27 +1000 |
| commit | c9d6329ef8eef4d69e5f3a80b9646276ef1ffeb4 (patch) | |
| tree | 8601cf862f5e1394727c3e8b1b78f24109f5bcb5 | |
| parent | d8c56299752141d2492ca67f7d85f40e95436700 (diff) | |
| parent | ddbb5dd99c40a695d5d75645b5a18bef394acb16 (diff) | |
Merge remote branch 'logfs/master'
Conflicts:
fs/logfs/logfs.h
| -rw-r--r-- | fs/logfs/dir.c | 2 | ||||
| -rw-r--r-- | fs/logfs/file.c | 6 | ||||
| -rw-r--r-- | fs/logfs/logfs.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c index 72d1893ddd36..e780b659b4c5 100644 --- a/fs/logfs/dir.c +++ b/fs/logfs/dir.c @@ -821,7 +821,7 @@ const struct inode_operations logfs_dir_iops = { }; const struct file_operations logfs_dir_fops = { .fsync = logfs_fsync, - .ioctl = logfs_ioctl, + .unlocked_ioctl = logfs_ioctl, .readdir = logfs_readdir, .read = generic_read_dir, }; diff --git a/fs/logfs/file.c b/fs/logfs/file.c index abe1cafbd4c2..0f91548383e0 100644 --- a/fs/logfs/file.c +++ b/fs/logfs/file.c @@ -181,9 +181,9 @@ static int logfs_releasepage(struct page *page, gfp_t only_xfs_uses_this) } -int logfs_ioctl(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg) +long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { + struct inode *inode = file->f_path.dentry->d_inode; struct logfs_inode *li = logfs_inode(inode); unsigned int oldflags, flags; int err; @@ -251,7 +251,7 @@ const struct file_operations logfs_reg_fops = { .aio_read = generic_file_aio_read, .aio_write = generic_file_aio_write, .fsync = logfs_fsync, - .ioctl = logfs_ioctl, + .unlocked_ioctl = logfs_ioctl, .llseek = generic_file_llseek, .mmap = generic_file_readonly_mmap, .open = generic_file_open, diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index c838c4d72111..a6e8487e3844 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h @@ -504,8 +504,8 @@ extern const struct inode_operations logfs_reg_iops; extern const struct file_operations logfs_reg_fops; extern const struct address_space_operations logfs_reg_aops; int logfs_readpage(struct file *file, struct page *page); -int logfs_ioctl(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg); +long logfs_ioctl(struct file *file, unsigned int cmd, + unsigned long arg); int logfs_fsync(struct file *file, int datasync); /* gc.c */ |