summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/fs/msdosfs/msdosfs_vfsops.c23
-rw-r--r--sys/gnu/ext2fs/ext2_vfsops.c25
-rw-r--r--sys/gnu/fs/ext2fs/ext2_vfsops.c25
3 files changed, 38 insertions, 35 deletions
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 0b21bc1..12dd65c 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -330,14 +330,15 @@ mountmsdosfs(devvp, mp, td, argp)
ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
/*
- * XXX Open the device with write access even if the filesystem
- * is read-only: someone may remount it read-write later, and
- * we don't VOP_OPEN the device again in that case.
+ * XXX: open the device with read and write access even if only
+ * read access is needed now. Write access is needed if the
+ * filesystem is ever mounted read/write, and we don't change the
+ * access mode for remounts.
*/
#ifdef notyet
- error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1);
+ error = VOP_OPEN(devvp, ronly ? FREAD : FREAD | FWRITE, FSCRED, td, -1);
#else
- error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td, -1);
+ error = VOP_OPEN(devvp, FREAD | FWRITE, FSCRED, td, -1);
#endif
VOP_UNLOCK(devvp, 0, td);
if (error)
@@ -631,11 +632,11 @@ mountmsdosfs(devvp, mp, td, argp)
error_exit:
if (bp)
brelse(bp);
- /* XXX See comment at VOP_OPEN call */
+ /* XXX: see comment above VOP_OPEN. */
#ifdef notyet
- (void) VOP_CLOSE(devvp, ronly ? FREAD : FREAD | FWRITE, NOCRED, td);
+ (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD | FWRITE, NOCRED, td);
#else
- (void) VOP_CLOSE(devvp, FREAD | FWRITE, NOCRED, td);
+ (void)VOP_CLOSE(devvp, FREAD | FWRITE, NOCRED, td);
#endif
if (pmp) {
if (pmp->pm_inusemap)
@@ -708,11 +709,11 @@ msdosfs_unmount(mp, mntflags, td)
VI_UNLOCK(vp);
}
#endif
- /* XXX See comment at VOP_OPEN call */
+ /* XXX: see comment above VOP_OPEN. */
#ifdef notyet
error = VOP_CLOSE(pmp->pm_devvp,
- (pmp->pm_flags&MSDOSFSMNT_RONLY) ? FREAD : FREAD | FWRITE,
- NOCRED, td);
+ (pmp->pm_flags & MSDOSFSMNT_RONLY) ? FREAD : FREAD | FWRITE,
+ NOCRED, td);
#else
error = VOP_CLOSE(pmp->pm_devvp, FREAD | FWRITE, NOCRED, td);
#endif
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index b3b327d..17ca619 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -656,14 +656,15 @@ ext2_mountfs(devvp, mp, td)
ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
/*
- * XXX Open the device with write access even if the filesystem
- * is read-only: someone may remount it read-write later, and
- * we don't VOP_OPEN the device again in that case.
+ * XXX: open the device with read and write access even if only
+ * read access is needed now. Write access is needed if the
+ * filesystem is ever mounted read/write, and we don't change the
+ * access mode for remounts.
*/
#ifdef notyet
- error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1);
+ error = VOP_OPEN(devvp, ronly ? FREAD : FREAD | FWRITE, FSCRED, td, -1);
#else
- error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td, -1);
+ error = VOP_OPEN(devvp, FREAD | FWRITE, FSCRED, td, -1);
#endif
VOP_UNLOCK(devvp, 0, td);
if (error)
@@ -744,11 +745,11 @@ ext2_mountfs(devvp, mp, td)
out:
if (bp)
brelse(bp);
- /* XXX See comment at VOP_OPEN call */
+ /* XXX: see comment above VOP_OPEN. */
#ifdef notyet
- (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, td);
+ (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD | FWRITE, NOCRED, td);
#else
- (void)VOP_CLOSE(devvp, FREAD|FWRITE, NOCRED, td);
+ (void)VOP_CLOSE(devvp, FREAD | FWRITE, NOCRED, td);
#endif
if (ump) {
bsd_free(ump->um_e2fs->s_es, M_EXT2MNT);
@@ -804,12 +805,12 @@ ext2_unmount(mp, mntflags, td)
ULCK_BUF(fs->s_block_bitmap[i])
ump->um_devvp->v_rdev->si_mountpoint = NULL;
- /* XXX See comment at VOP_OPEN call */
+ /* XXX: see comment above VOP_OPEN. */
#ifdef notyet
- error = VOP_CLOSE(ump->um_devvp, ronly ? FREAD : FREAD|FWRITE,
- NOCRED, td);
+ error = VOP_CLOSE(ump->um_devvp, ronly ? FREAD : FREAD | FWRITE,
+ NOCRED, td);
#else
- error = VOP_CLOSE(ump->um_devvp, FREAD|FWRITE, NOCRED, td);
+ error = VOP_CLOSE(ump->um_devvp, FREAD | FWRITE, NOCRED, td);
#endif
vrele(ump->um_devvp);
bsd_free(fs->s_es, M_EXT2MNT);
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index b3b327d..17ca619 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -656,14 +656,15 @@ ext2_mountfs(devvp, mp, td)
ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
/*
- * XXX Open the device with write access even if the filesystem
- * is read-only: someone may remount it read-write later, and
- * we don't VOP_OPEN the device again in that case.
+ * XXX: open the device with read and write access even if only
+ * read access is needed now. Write access is needed if the
+ * filesystem is ever mounted read/write, and we don't change the
+ * access mode for remounts.
*/
#ifdef notyet
- error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1);
+ error = VOP_OPEN(devvp, ronly ? FREAD : FREAD | FWRITE, FSCRED, td, -1);
#else
- error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td, -1);
+ error = VOP_OPEN(devvp, FREAD | FWRITE, FSCRED, td, -1);
#endif
VOP_UNLOCK(devvp, 0, td);
if (error)
@@ -744,11 +745,11 @@ ext2_mountfs(devvp, mp, td)
out:
if (bp)
brelse(bp);
- /* XXX See comment at VOP_OPEN call */
+ /* XXX: see comment above VOP_OPEN. */
#ifdef notyet
- (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, td);
+ (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD | FWRITE, NOCRED, td);
#else
- (void)VOP_CLOSE(devvp, FREAD|FWRITE, NOCRED, td);
+ (void)VOP_CLOSE(devvp, FREAD | FWRITE, NOCRED, td);
#endif
if (ump) {
bsd_free(ump->um_e2fs->s_es, M_EXT2MNT);
@@ -804,12 +805,12 @@ ext2_unmount(mp, mntflags, td)
ULCK_BUF(fs->s_block_bitmap[i])
ump->um_devvp->v_rdev->si_mountpoint = NULL;
- /* XXX See comment at VOP_OPEN call */
+ /* XXX: see comment above VOP_OPEN. */
#ifdef notyet
- error = VOP_CLOSE(ump->um_devvp, ronly ? FREAD : FREAD|FWRITE,
- NOCRED, td);
+ error = VOP_CLOSE(ump->um_devvp, ronly ? FREAD : FREAD | FWRITE,
+ NOCRED, td);
#else
- error = VOP_CLOSE(ump->um_devvp, FREAD|FWRITE, NOCRED, td);
+ error = VOP_CLOSE(ump->um_devvp, FREAD | FWRITE, NOCRED, td);
#endif
vrele(ump->um_devvp);
bsd_free(fs->s_es, M_EXT2MNT);
OpenPOWER on IntegriCloud