From 3c668b7d03bd3dd3ee82a61363fb74677dc21059 Mon Sep 17 00:00:00 2001 From: yura Date: Fri, 15 Dec 2006 17:00:02 +0000 Subject: [PATCH] - O_EXCL already handled by MNT_NOT_EXCLUSIVE at more early stage - fix comments --- libntfs/freebsd_io.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/libntfs/freebsd_io.c b/libntfs/freebsd_io.c index cd348d59..f5e96c00 100644 --- a/libntfs/freebsd_io.c +++ b/libntfs/freebsd_io.c @@ -1,12 +1,12 @@ /** - * freebsd_io.c - FreeBSD disk io functions. Originated from the Linux-NTFS - * project. + * freebsd_io.c - FreeBSD disk io functions. Part of the Linux-NTFS project. * - * FreeBSD 5.0+ does not have character devices and requires - * read/writes from/to block devices to be sector aligned. + * FreeBSD 5.0+ does not have block devices and requires read/writes from/to + * character devices to be sector aligned. * * Copyright (c) 2006 Max Khon * Copyright (c) 2006 Anton Altaparmakov + * Copyright (c) 2006 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -177,15 +177,6 @@ static int ntfs_device_freebsd_io_open(struct ntfs_device *dev, int flags) DEV_FD(dev)->block_size = 0; DEV_FD(dev)->media_size = 0; - /* - * Open file for exclusive access if mounting r/w. - * Fuseblk takes care about block devices. - * FIXME: This is totally wrong. ntfsmount needs to just disabled the - * O_EXCL otherwise all other utilities are not mounting O_EXCL when - * they definitely should be doing it! - */ - if (!NDevBlock(dev) && (flags & O_RDWR) == O_RDWR) - flags |= O_EXCL; DEV_FD(dev)->fd = open(dev->d_name, flags); if (DEV_FD(dev)->fd == -1) { err = errno;