Merge "Avoid calling rollback() in setVisibility() when nothing changed"

diff --combined includes/revisiondelete/RevDelList.php
index bad9d77,309c6bd..3c81feb
--- 1/includes/revisiondelete/RevDelList.php
--- 2/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@@ -234,7 -234,7 +234,7 @@@ abstract class RevDelList extends Revis
                }
  
                if ( $status->successCount == 0 ) {
-                       $dbw->rollback( __METHOD__ );
+                       $dbw->endAtomic( __METHOD__ );
                        return $status;
                }
  
@@@ -244,8 -244,8 +244,8 @@@
                // Move files, if there are any
                $status->merge( $this->doPreCommitUpdates() );
                if ( !$status->isOK() ) {
 -                      // Fatal error, such as no configured archive directory
 -                      $dbw->rollback( __METHOD__ );
 +                      // Fatal error, such as no configured archive directory or I/O failures
 +                      wfGetLBFactory()->rollbackMasterChanges( __METHOD__ );
                        return $status;
                }