PERFORCE change 162481 for review

[Aditya Sarawgi]

http://perforce.freebsd.org/chv.cgi?CH=162481

Change 162481 by truncs at aditya on 2009/05/21 19:15:49

	PR:122047 Mapping only SF_* flags to EXT2_* flags.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 (text+ko) ====

@@ -83,8 +83,8 @@
 	ip->i_mtime = ei->i_mtime;
 	ip->i_ctime = ei->i_ctime;
 	ip->i_flags = 0;
-	ip->i_flags |= (ei->i_flags & EXT2_APPEND_FL) ? APPEND : 0;
-	ip->i_flags |= (ei->i_flags & EXT2_IMMUTABLE_FL) ? IMMUTABLE : 0;
+	ip->i_flags |= (ei->i_flags & EXT2_APPEND_FL) ? SF_APPEND : 0;
+	ip->i_flags |= (ei->i_flags & EXT2_IMMUTABLE_FL) ? SF_IMMUTABLE : 0;
 	ip->i_blocks = ei->i_blocks;
 	ip->i_gen = ei->i_generation;
 	ip->i_uid = ei->i_uid;
@@ -121,8 +121,8 @@
 	ei->i_ctime = ip->i_ctime;
 	ei->i_flags = ip->i_flags;
 	ei->i_flags = 0;
-	ei->i_flags |= (ip->i_flags & APPEND) ? EXT2_APPEND_FL: 0;
-	ei->i_flags |= (ip->i_flags & IMMUTABLE) ? EXT2_IMMUTABLE_FL: 0;
+	ei->i_flags |= (ip->i_flags & SF_APPEND) ? EXT2_APPEND_FL: 0;
+	ei->i_flags |= (ip->i_flags & SF_IMMUTABLE) ? EXT2_IMMUTABLE_FL: 0;
 	ei->i_blocks = ip->i_blocks;
 	ei->i_generation = ip->i_gen;
 	ei->i_uid = ip->i_uid;

==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 (text+ko) ====

@@ -247,7 +247,7 @@
 	/*
 	 * Files marked append-only must be opened for appending.
 	 */
-	if ((VTOI(ap->a_vp)->i_flags & APPEND) &&
+	if ((VTOI(ap->a_vp)->i_flags & SF_APPEND) &&
 	    (ap->a_mode & (FWRITE | O_APPEND)) == FWRITE)
 		return (EPERM);
 
@@ -315,7 +315,7 @@
 	}
 
 	/* If immutable bit set, nobody gets to write it. */
-	if ((accmode & VWRITE) && (ip->i_flags & (IMMUTABLE | SF_SNAPSHOT)))
+	if ((accmode & VWRITE) && (ip->i_flags & (SF_IMMUTABLE | SF_SNAPSHOT)))
 		return (EPERM);
 
 	error = vaccess(vp->v_type, ip->i_mode, ip->i_uid, ip->i_gid,
@@ -422,10 +422,10 @@
 			ip->i_flags |= (vap->va_flags & UF_SETTABLE);
 		}
 		ip->i_flag |= IN_CHANGE;
-		if (vap->va_flags & (IMMUTABLE | APPEND))
+		if (vap->va_flags & (SF_IMMUTABLE | SF_APPEND))
 			return (0);
 	}
-	if (ip->i_flags & (IMMUTABLE | APPEND))
+	if (ip->i_flags & (SF_IMMUTABLE | SF_APPEND))
 		return (EPERM);
 	/*
 	 * Go through the fields and update iff not VNOVAL.
@@ -675,8 +675,8 @@
 	int error;
 
 	ip = VTOI(vp);
-	if ((ip->i_flags & (NOUNLINK | IMMUTABLE | APPEND)) ||
-	    (VTOI(dvp)->i_flags & APPEND)) {
+	if ((ip->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND)) ||
+	    (VTOI(dvp)->i_flags & SF_APPEND)) {
 		error = EPERM;
 		goto out;
 	}
@@ -719,7 +719,7 @@
 		error = EMLINK;
 		goto out;
 	}
-	if (ip->i_flags & (IMMUTABLE | APPEND)) {
+	if (ip->i_flags & (SF_IMMUTABLE | SF_APPEND)) {
 		error = EPERM;
 		goto out;
 	}
@@ -786,8 +786,8 @@
 		return (error);
 	}
 
-	if (tvp && ((VTOI(tvp)->i_flags & (NOUNLINK | IMMUTABLE | APPEND)) ||
-	    (VTOI(tdvp)->i_flags & APPEND))) {
+	if (tvp && ((VTOI(tvp)->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND)) ||
+	    (VTOI(tdvp)->i_flags & SF_APPEND))) {
 		error = EPERM;
 		goto abortit;
 	}
@@ -811,8 +811,8 @@
  		error = EMLINK;
  		goto abortit;
  	}
-	if ((ip->i_flags & (NOUNLINK | IMMUTABLE | APPEND))
-	    || (dp->i_flags & APPEND)) {
+	if ((ip->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND))
+	    || (dp->i_flags & SF_APPEND)) {
 		VOP_UNLOCK(fvp, 0);
 		error = EPERM;
 		goto abortit;
@@ -1271,8 +1271,8 @@
 		error = ENOTEMPTY;
 		goto out;
 	}
-	if ((dp->i_flags & APPEND)
-	    || (ip->i_flags & (NOUNLINK | IMMUTABLE | APPEND))) {
+	if ((dp->i_flags & SF_APPEND)
+	    || (ip->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND))) {
 		error = EPERM;
 		goto out;
 	}