[Pvfs2-cvs] commit by nlmills in pvfs2/src/apps/fuse: pvfs2fuse.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/apps/fuse
In directory parlweb1:/tmp/cvs-serv27537/src/apps/fuse

Modified Files:
      Tag: cu-security-branch
	pvfs2fuse.c 
Log Message:
merge with Orange-Branch


Index: pvfs2fuse.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/fuse/pvfs2fuse.c,v
diff -p -u -r1.3.28.4 -r1.3.28.5
--- pvfs2fuse.c	19 Jun 2010 00:01:28 -0000	1.3.28.4
+++ pvfs2fuse.c	13 Jan 2011 20:11:42 -0000	1.3.28.5
@@ -9,13 +9,13 @@
  *   Author: John A. Chandy
  *           Sumit Narayan
  *
- *   $Date: 2010/06/19 00:01:28 $
- *   $Revision: 1.3.28.4 $
+ *   $Date: 2011/01/13 20:11:42 $
+ *   $Revision: 1.3.28.5 $
  *
  *   Documentation: http://www.engr.uconn.edu/~sun03001/docs/pvfs2fuse-rpt.pdf
  */
 
-/* char *pvfs2fuse_version = "$Id: pvfs2fuse.c,v 1.3.28.4 2010/06/19 00:01:28 nlmills Exp $"; */
+/* char *pvfs2fuse_version = "$Id: pvfs2fuse.c,v 1.3.28.5 2011/01/13 20:11:42 nlmills Exp $"; */
 char *pvfs2fuse_version = "0.01";
 
 #define FUSE_USE_VERSION 27
@@ -1183,7 +1183,7 @@ int main(int argc, char *argv[])
 	  me->flowproto = FLOWPROTO_DEFAULT;
 
 	  /* FIXME encoding should be an option */
-	  me->encoding = ENCODING_DEFAULT;
+	  me->encoding = PVFS2_ENCODING_DEFAULT;
 
 	  /* FIXME default_num_dfiles should be an option */