1 files changed, 7 insertions, 7 deletions

diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index 9124425b7f2f..3ff3d9e23ded 100644
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -344,9 +344,9 @@ _xfs_filestream_update_ag(
          * 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 &&
-                       (pip->i_d.di_mode & S_IFDIR)) ||
-                      ((ip->i_d.di_mode & S_IFDIR) && !pip)));
+        ASSERT(ip && ((S_ISREG(ip->i_d.di_mode) && pip &&
+                       S_ISDIR(pip->i_d.di_mode)) ||
+                      (S_ISDIR(ip->i_d.di_mode) && !pip)));
 
         mp = ip->i_mount;
         cache = mp->m_filestream;
@@ -537,7 +537,7 @@ xfs_filestream_lookup_ag(
         xfs_agnumber_t  ag;
         int             ref;
 
-        if (!(ip->i_d.di_mode & (S_IFREG | S_IFDIR))) {
+        if (!S_ISREG(ip->i_d.di_mode) && !S_ISDIR(ip->i_d.di_mode)) {
                 ASSERT(0);
                 return NULLAGNUMBER;
         }
@@ -579,9 +579,9 @@ xfs_filestream_associate(
         xfs_agnumber_t  ag, rotorstep, startag;
         int             err = 0;
 
-        ASSERT(pip->i_d.di_mode & S_IFDIR);
-        ASSERT(ip->i_d.di_mode & S_IFREG);
-        if (!(pip->i_d.di_mode & S_IFDIR) || !(ip->i_d.di_mode & S_IFREG))
+        ASSERT(S_ISDIR(pip->i_d.di_mode));
+        ASSERT(S_ISREG(ip->i_d.di_mode));
+        if (!S_ISDIR(pip->i_d.di_mode) || !S_ISREG(ip->i_d.di_mode))
                 return -EINVAL;
 
         mp = pip->i_mount;