Merge pull request #4752 from edgargabriel/pr/v3.1.x-fs_ufs_bad_return_statement

bwbarrett · web-flow · commit b3496598a80a · 2018-01-30T15:44:17.000-08:00
fs/ufs: remove erroneous return statement
diff --git a/ompi/mca/fs/ufs/fs_ufs_file_open.c b/ompi/mca/fs/ufs/fs_ufs_file_open.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2008-2017 University of Houston. All rights reserved.
+ * Copyright (c) 2008-2018 University of Houston. All rights reserved.
  * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
@@ -157,7 +157,6 @@ mca_fs_ufs_file_open (struct ompi_communicator_t *comm,
                 ret = MPI_ERR_OTHER;
             }
 	}
-        return ret;
     }
 
     fh->f_stripe_size=0;

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* University of Stuttgart. All rights reserved.`
`10`	`10`	`* Copyright (c) 2004-2005 The Regents of the University of California.`
`11`	`11`	`* All rights reserved.`
`12`		`- * Copyright (c) 2008-2017 University of Houston. All rights reserved.`
	`12`	`+ * Copyright (c) 2008-2018 University of Houston. All rights reserved.`
`13`	`13`	`* Copyright (c) 2015-2017 Research Organization for Information Science`
`14`	`14`	`* and Technology (RIST). All rights reserved.`
`15`	`15`	`* Copyright (c) 2016-2017 IBM Corporation. All rights reserved.`
`@@ -157,7 +157,6 @@ mca_fs_ufs_file_open (struct ompi_communicator_t *comm,`
`157`	`157`	`ret = MPI_ERR_OTHER;`
`158`	`158`	`}`
`159`	`159`	`}`
`160`		`- return ret;`
`161`	`160`	`}`
`162`	`161`
`163`	`162`	`fh->f_stripe_size=0;`