[Pvfs2-cvs] commit by nlmills in pvfs2/src/server: get-attr.sm proto-error.sm

[CVS commit program]

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

Modified Files:
      Tag: cu-security-branch
	get-attr.sm proto-error.sm 
Log Message:
merge with Orange-Branch


Index: get-attr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/get-attr.sm,v
diff -p -u -r1.93.2.30 -r1.93.2.31
--- get-attr.sm	10 Dec 2010 13:57:41 -0000	1.93.2.30
+++ get-attr.sm	13 Jan 2011 20:11:47 -0000	1.93.2.31
@@ -831,8 +831,6 @@ static PINT_sm_action getattr_read_mirro
     {
         gossip_debug(GOSSIP_MIRROR_DEBUG,"\tNumber of mirrored copies cannot "
                                          "be retrieved.\n");
-        gossip_lerr("Mirror handles requested, but number of mirrored copies "
-                    "cannot be retrieved.\n");
         if (resp->u.getattr.attr.mask & (PVFS_ATTR_META_DFILES |
                                          PVFS_ATTR_META_DIST) )
         {

Index: proto-error.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/proto-error.sm,v
diff -p -u -r1.8.2.5 -r1.8.2.6
--- proto-error.sm	19 Jun 2010 00:02:22 -0000	1.8.2.5
+++ proto-error.sm	13 Jan 2011 20:11:47 -0000	1.8.2.6
@@ -53,7 +53,7 @@ static PINT_sm_action proto_error_init(
 		      PINT_ENCODE_RESP,
 		      &(s_op->encoded),
 		      s_op->addr,
-		      ENCODING_DEFAULT);
+		      PVFS2_ENCODING_DEFAULT);
     if (ret < 0)
     {
 	gossip_lerr("Error: PINT_encode() failure.\n");