svn commit: r233120 - in stable/9/sys/fs: hpfs msdosfs ntfs

[Kevin Lo]

Author: kevlo
Date: Sun Mar 18 15:03:02 2012
New Revision: 233120
URL: http://svn.freebsd.org/changeset/base/233120

Log:
  MFC r232483:
  
  Clean up style(9) nits

Modified:
  stable/9/sys/fs/hpfs/hpfs_vfsops.c
  stable/9/sys/fs/msdosfs/msdosfs_vfsops.c
  stable/9/sys/fs/ntfs/ntfs_vfsops.c
Directory Properties:
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)

Modified: stable/9/sys/fs/hpfs/hpfs_vfsops.c
==============================================================================
--- stable/9/sys/fs/hpfs/hpfs_vfsops.c	Sun Mar 18 14:49:36 2012	(r233119)
+++ stable/9/sys/fs/hpfs/hpfs_vfsops.c	Sun Mar 18 15:03:02 2012	(r233120)
@@ -283,11 +283,11 @@ hpfs_mountfs(devvp, mp, td)
 	hpmp->hpm_devvp = devvp;
 	hpmp->hpm_dev = devvp->v_rdev;
 	hpmp->hpm_mp = mp;
-	if (1 == vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v))
+	if (vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v) == 1)
 		hpmp->hpm_uid = v;
-	if (1 == vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v))
+	if (vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v) == 1)
 		hpmp->hpm_gid = v;
-	if (1 == vfs_scanopt(mp->mnt_optnew, "mode", "%d", &v))
+	if (vfs_scanopt(mp->mnt_optnew, "mode", "%d", &v) == 1)
 		hpmp->hpm_mode = v;
 
 	error = hpfs_bminit(hpmp);

Modified: stable/9/sys/fs/msdosfs/msdosfs_vfsops.c
==============================================================================
--- stable/9/sys/fs/msdosfs/msdosfs_vfsops.c	Sun Mar 18 14:49:36 2012	(r233119)
+++ stable/9/sys/fs/msdosfs/msdosfs_vfsops.c	Sun Mar 18 15:03:02 2012	(r233120)
@@ -149,13 +149,13 @@ update_mp(struct mount *mp, struct threa
 		}
 	}
 
-	if (1 == vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v))
+	if (vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v) == 1)
 		pmp->pm_gid = v;
-	if (1 == vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v))
+	if (vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v) == 1)
 		pmp->pm_uid = v;
-	if (1 == vfs_scanopt(mp->mnt_optnew, "mask", "%d", &v))
+	if (vfs_scanopt(mp->mnt_optnew, "mask", "%d", &v) == 1)
 		pmp->pm_mask = v & ALLPERMS;
-	if (1 == vfs_scanopt(mp->mnt_optnew, "dirmask", "%d", &v))
+	if (vfs_scanopt(mp->mnt_optnew, "dirmask", "%d", &v) == 1)
 		pmp->pm_dirmask = v & ALLPERMS;
 	vfs_flagopt(mp->mnt_optnew, "shortname",
 	    &pmp->pm_flags, MSDOSFSMNT_SHORTNAME);

Modified: stable/9/sys/fs/ntfs/ntfs_vfsops.c
==============================================================================
--- stable/9/sys/fs/ntfs/ntfs_vfsops.c	Sun Mar 18 14:49:36 2012	(r233119)
+++ stable/9/sys/fs/ntfs/ntfs_vfsops.c	Sun Mar 18 15:03:02 2012	(r233120)
@@ -345,11 +345,11 @@ ntfs_mountfs(devvp, mp, td)
 
 	ntmp->ntm_mountp = mp;
 	ntmp->ntm_devvp = devvp;
-	if (1 == vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v))
+	if (vfs_scanopt(mp->mnt_optnew, "uid", "%d", &v) == 1)
 		ntmp->ntm_uid = v;
-	if (1 == vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v))
+	if (vfs_scanopt(mp->mnt_optnew, "gid", "%d", &v) == 1)
 		ntmp->ntm_gid = v;
-	if (1 == vfs_scanopt(mp->mnt_optnew, "mode", "%d", &v))
+	if (vfs_scanopt(mp->mnt_optnew, "mode", "%d", &v) == 1)
 		ntmp->ntm_mode = v & ACCESSPERMS;
 	vfs_flagopt(mp->mnt_optnew,
 	    "caseins", &ntmp->ntm_flag, NTFS_MFLAG_CASEINS);