git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
nilfs2
/
nilfs.h
diff --git
a/fs/nilfs2/nilfs.h
b/fs/nilfs2/nilfs.h
index
3d0c18a
..
da6fc0b
100644
(file)
--- 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);
/* 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);
/* inode.c */
extern struct inode *nilfs_new_inode(struct inode *, int);