Deleted Added
sdiff udiff text old ( 225830 ) new ( 225832 )
full compact
primary.c (225830) primary.c (225832)
1/*-
2 * Copyright (c) 2009 The FreeBSD Foundation
3 * Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
4 * All rights reserved.
5 *
6 * This software was developed by Pawel Jakub Dawidek under sponsorship from
7 * the FreeBSD Foundation.
8 *

--- 15 unchanged lines hidden (view full) ---

24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2009 The FreeBSD Foundation
3 * Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
4 * All rights reserved.
5 *
6 * This software was developed by Pawel Jakub Dawidek under sponsorship from
7 * the FreeBSD Foundation.
8 *

--- 15 unchanged lines hidden (view full) ---

24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sbin/hastd/primary.c 225830 2011-09-28 13:08:51Z pjd $");
32__FBSDID("$FreeBSD: head/sbin/hastd/primary.c 225832 2011-09-28 13:19:47Z pjd $");
33
34#include <sys/types.h>
35#include <sys/time.h>
36#include <sys/bio.h>
37#include <sys/disk.h>
38#include <sys/refcount.h>
39#include <sys/stat.h>
40

--- 1258 unchanged lines hidden (view full) ---

1299 reqlog(LOG_WARNING, 0, ggio,
1300 "Local request failed (%s): ",
1301 strerror(errno));
1302 } else {
1303 hio->hio_errors[ncomp] = 0;
1304 }
1305 break;
1306 case BIO_FLUSH:
33
34#include <sys/types.h>
35#include <sys/time.h>
36#include <sys/bio.h>
37#include <sys/disk.h>
38#include <sys/refcount.h>
39#include <sys/stat.h>
40

--- 1258 unchanged lines hidden (view full) ---

1299 reqlog(LOG_WARNING, 0, ggio,
1300 "Local request failed (%s): ",
1301 strerror(errno));
1302 } else {
1303 hio->hio_errors[ncomp] = 0;
1304 }
1305 break;
1306 case BIO_FLUSH:
1307 if (!res->hr_localflush) {
1308 ret = -1;
1309 errno = EOPNOTSUPP;
1310 break;
1311 }
1307 ret = g_flush(res->hr_localfd);
1308 if (ret < 0) {
1312 ret = g_flush(res->hr_localfd);
1313 if (ret < 0) {
1314 if (errno == EOPNOTSUPP)
1315 res->hr_localflush = false;
1309 hio->hio_errors[ncomp] = errno;
1310 reqlog(LOG_WARNING, 0, ggio,
1311 "Local request failed (%s): ",
1312 strerror(errno));
1313 } else {
1314 hio->hio_errors[ncomp] = 0;
1315 }
1316 break;

--- 919 unchanged lines hidden --- 		1316 hio->hio_errors[ncomp] = errno;
1317 reqlog(LOG_WARNING, 0, ggio,
1318 "Local request failed (%s): ",
1319 strerror(errno));
1320 } else {
1321 hio->hio_errors[ncomp] = 0;
1322 }
1323 break;

--- 919 unchanged lines hidden ---