diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-13 16:32:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-13 16:32:16 -0700 |
| commit | 014049a1c7d5ab42ffbe3995f36372c1cdda16a7 (patch) | |
| tree | 437be943ef7c5e76df84806c6ea555c242d6f706 /fs/nilfs2/nilfs.h | |
| parent | c98861f7de20fa982de0b5bbe01628414d7a7fbf (diff) | |
| parent | 83aca8f480fcd2d9748301a5d060cf947dc75b94 (diff) | |
| download | op-kernel-dev-014049a1c7d5ab42ffbe3995f36372c1cdda16a7.zip op-kernel-dev-014049a1c7d5ab42ffbe3995f36372c1cdda16a7.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: check size of array structured data exchanged via ioctls
nilfs2: fix lock order reversal in nilfs_clean_segments ioctl
nilfs2: fix possible circular locking for get information ioctls
nilfs2: ensure to clear dirty state when deleting metadata file block
nilfs2: fix circular locking dependency of writer mutex
nilfs2: fix possible recovery failure due to block creation without writer
Diffstat (limited to 'fs/nilfs2/nilfs.h')
| -rw-r--r-- | fs/nilfs2/nilfs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h index 3d0c18a..da6fc0b 100644 --- a/fs/nilfs2/nilfs.h +++ b/fs/nilfs2/nilfs.h @@ -236,7 +236,8 @@ extern int nilfs_sync_file(struct file *, struct dentry *, int); /* ioctl.c */ long nilfs_ioctl(struct file *, unsigned int, unsigned long); -int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *, void __user *); +int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *, struct nilfs_argv *, + void **); /* inode.c */ extern struct inode *nilfs_new_inode(struct inode *, int); |
