[Pvfs2-cvs] commit by nlmills in pvfs2/src/apps/kernel/linux: pvfs2-client-core.c

[CVS commit program]

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

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


Index: pvfs2-client-core.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/pvfs2-client-core.c,v
diff -p -u -r1.92.2.12 -r1.92.2.13
--- pvfs2-client-core.c	14 Jul 2010 21:37:27 -0000	1.92.2.12
+++ pvfs2-client-core.c	13 Jan 2011 20:11:43 -0000	1.92.2.13
@@ -1244,7 +1244,7 @@ static inline int generate_upcall_mntent
         GOSSIP_CLIENTCORE_DEBUG, "Got FS Name: %s (len=%d)\n",
         mntent->pvfs_fs_name, (int)strlen(mntent->pvfs_fs_name));
                                                               
-    mntent->encoding = ENCODING_DEFAULT;                      
+    mntent->encoding = PVFS2_ENCODING_DEFAULT;                      
     mntent->flowproto = FLOWPROTO_DEFAULT;                   
                                                            
     /* also fill in the fs_id for umount */