Changes by: cha0smaster
Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9278/ntfsprogs
Modified Files:
ntfsmount.c
Log Message:
determine to where pass kernel_cache option without #if's
Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- ntfsmount.c 2 Dec 2005 17:09:41 -0000 1.72
+++ ntfsmount.c 3 Dec 2005 16:40:20 -0000 1.73
@@ -1766,13 +1766,13 @@ int main(int argc, char *argv[])
}
free(parsed_options);
if (!ctx->debug) {
-#if FUSE_MINOR_VERSION >= 4
- fh = fuse_new(ffd, "use_ino,kernel_cache", &ntfs_fuse_oper,
- sizeof(ntfs_fuse_oper));
-#else
- fh = fuse_new(ffd, "use_ino", &ntfs_fuse_oper,
- sizeof(ntfs_fuse_oper));
-#endif
+ if (fuse_is_lib_option("kernel_cache"))
+ fh = fuse_new(ffd, "use_ino,kernel_cache",
+ &ntfs_fuse_oper,
+ sizeof(ntfs_fuse_oper));
+ else
+ fh = fuse_new(ffd, "use_ino", &ntfs_fuse_oper,
+ sizeof(ntfs_fuse_oper));
} else
fh = fuse_new(ffd, "debug,use_ino" , &ntfs_fuse_oper,
sizeof(ntfs_fuse_oper));
|
