svn commit: r261034 - head/sys/fs/ext2fs

[Pedro F. Giffuni]

Author: pfg
Date: Wed Jan 22 19:09:41 2014
New Revision: 261034
URL: http://svnweb.freebsd.org/changeset/base/261034

Log:
  ext2fs: fix logic error in the previous change.
  
  Use the bitwise negation instead of bogus boolean negation and move
  the flag manipulation with the assignment.
  Fix some grammatical errors introduced in the same change.
  
  Reported by:	bde
  MFC after:	3 days

Modified:
  head/sys/fs/ext2fs/ext2_lookup.c
  head/sys/fs/ext2fs/ext2_subr.c
  head/sys/fs/ext2fs/ext2_vnops.c

Modified: head/sys/fs/ext2fs/ext2_lookup.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_lookup.c	Wed Jan 22 17:50:43 2014	(r261033)
+++ head/sys/fs/ext2fs/ext2_lookup.c	Wed Jan 22 19:09:41 2014	(r261034)
@@ -888,9 +888,9 @@ ext2_direnter(struct inode *ip, struct v
 	if (ext2_htree_has_idx(dp)) {
 		error = ext2_htree_add_entry(dvp, &newdir, cnp);
 		if (error) {
-			/* XXX: These seem to be set in the wrong place. */
-			dp->i_flags |= IN_CHANGE | IN_UPDATE;
+			/* XXX: These are set in the wrong place. */
 			dp->i_flags &= ~E4_INDEX;
+			dp->i_flags |= IN_CHANGE | IN_UPDATE;
 		}
 		return (error);
 	}

Modified: head/sys/fs/ext2fs/ext2_subr.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_subr.c	Wed Jan 22 17:50:43 2014	(r261033)
+++ head/sys/fs/ext2fs/ext2_subr.c	Wed Jan 22 19:09:41 2014	(r261034)
@@ -82,7 +82,7 @@ ext2_blkatoff(struct vnode *vp, off_t of
 	*bpp = NULL;
 
 	/*
-	 * E4_EXTENTS requires special treatment otherwise we can fall
+	 * E4_EXTENTS requires special treatment as we can otherwise fall
 	 * back to the normal path.
 	 */
 	if (!(ip->i_flags & E4_EXTENTS))

Modified: head/sys/fs/ext2fs/ext2_vnops.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_vnops.c	Wed Jan 22 17:50:43 2014	(r261033)
+++ head/sys/fs/ext2fs/ext2_vnops.c	Wed Jan 22 19:09:41 2014	(r261034)
@@ -343,9 +343,8 @@ ext2_getattr(struct vop_getattr_args *ap
 		vap->va_birthtime.tv_sec = ip->i_birthtime;
 		vap->va_birthtime.tv_nsec = ip->i_birthnsec;
 	}
-	vap->va_flags = ip->i_flags;
-	/* E4_* flags are private to the driver */
-	vap->va_flags &= !(E4_INDEX | E4_EXTENTS);
+	/* E4_* flags are private to the filesystem. */
+	vap->va_flags = ip->i_flags & ~(E4_INDEX | E4_EXTENTS);
 	vap->va_gen = ip->i_gen;
 	vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize;
 	vap->va_bytes = dbtob((u_quad_t)ip->i_blocks);