Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[deliverable/linux.git] / fs / nilfs2 / nilfs.h

diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h
index 7558c977db02655a6158ddd64e4094d9abbbeead..da6fc0bba2e5306d407538c7bc0eba94277a055a 100644 (file)
--- a/fs/nilfs2/nilfs.h
+++ b/fs/nilfs2/nilfs.h
@@ -34,11 +34,6 @@
 #include "bmap.h"
 #include "bmap_union.h"
 
-/*
- * NILFS filesystem version
- */
-#define NILFS_VERSION          "2.0.5"
-
 /*
  * nilfs inode data in memory
  */
@@ -241,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);