commit abbede1b3a680e108d61aaa415ce5153296e775d
author Al Viro <viro@zeniv.linux.org.uk> Tue Jul 26 02:31:30 2011 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Tue Jul 26 15:05:16 2011 -0400
tree 0fb8b8db864e5919b02f5d7dd2d66474e76a39d5
parent c46c887744b330795eba55fdb96343c36d481765

xfs: get rid of open-coded S_ISREG(), etc.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/xfs/xfs_filestream.c

diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index 9124425..87fcece 100644
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -344,7 +344,7 @@
 	 * Either ip is a regular file and pip is a directory, or ip is a
 	 * directory and pip is NULL.
 	 */
-	ASSERT(ip && (((ip->i_d.di_mode & S_IFREG) && pip &&
+	ASSERT(ip && ((S_ISREG(ip->i_d.di_mode) && pip &&
 	               (pip->i_d.di_mode & S_IFDIR)) ||
 	              ((ip->i_d.di_mode & S_IFDIR) && !pip)));