diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /fs/nilfs2/nilfs.h | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'fs/nilfs2/nilfs.h')
| -rw-r--r-- | fs/nilfs2/nilfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h index 8723e5bfd071..47d6d7928122 100644 --- a/fs/nilfs2/nilfs.h +++ b/fs/nilfs2/nilfs.h | |||
| @@ -228,7 +228,7 @@ extern void nilfs_set_link(struct inode *, struct nilfs_dir_entry *, | |||
| 228 | struct page *, struct inode *); | 228 | struct page *, struct inode *); |
| 229 | 229 | ||
| 230 | /* file.c */ | 230 | /* file.c */ |
| 231 | extern int nilfs_sync_file(struct file *, struct dentry *, int); | 231 | extern int nilfs_sync_file(struct file *, int); |
| 232 | 232 | ||
| 233 | /* ioctl.c */ | 233 | /* ioctl.c */ |
| 234 | long nilfs_ioctl(struct file *, unsigned int, unsigned long); | 234 | long nilfs_ioctl(struct file *, unsigned int, unsigned long); |