Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03209378 authored by Al Viro's avatar Al Viro
Browse files

xfs: fix misspelled S_IS...() 



mode_t is not a bitmap...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent abbede1b

fs/xfs/linux-2.6/xfs_ioctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -265,7 +265,7 @@ xfs_open_by_handle( 
		return PTR_ERR(filp);

		return PTR_ERR(filp);

	}

	}





	if (inode->i_mode & S_IFREG) {

	if (S_ISREG(inode->i_mode)) {

		filp->f_flags |= O_NOATIME;

		filp->f_flags |= O_NOATIME;

		filp->f_mode |= FMODE_NOCMTIME;

		filp->f_mode |= FMODE_NOCMTIME;

	}

	}

fs/xfs/xfs_filestream.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -345,8 +345,8 @@ _xfs_filestream_update_ag( 
	 * directory and pip is NULL.

	 * directory and pip is NULL.

	 */

	 */

	ASSERT(ip && ((S_ISREG(ip->i_d.di_mode) && pip &&

	ASSERT(ip && ((S_ISREG(ip->i_d.di_mode) && pip &&

	               (pip->i_d.di_mode & S_IFDIR)) ||

	               S_ISDIR(pip->i_d.di_mode)) ||

	              ((ip->i_d.di_mode & S_IFDIR) && !pip)));

	              (S_ISDIR(ip->i_d.di_mode) && !pip)));





	mp = ip->i_mount;

	mp = ip->i_mount;

	cache = mp->m_filestream;

	cache = mp->m_filestream;
@@ -537,7 +537,7 @@ xfs_filestream_lookup_ag( 
	xfs_agnumber_t	ag;

	xfs_agnumber_t	ag;

	int		ref;

	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);

		ASSERT(0);

		return NULLAGNUMBER;

		return NULLAGNUMBER;

	}

	}
@@ -579,9 +579,9 @@ xfs_filestream_associate( 
	xfs_agnumber_t	ag, rotorstep, startag;

	xfs_agnumber_t	ag, rotorstep, startag;

	int		err = 0;

	int		err = 0;





	ASSERT(pip->i_d.di_mode & S_IFDIR);

	ASSERT(S_ISDIR(pip->i_d.di_mode));

	ASSERT(ip->i_d.di_mode & S_IFREG);

	ASSERT(S_ISREG(ip->i_d.di_mode));

	if (!(pip->i_d.di_mode & S_IFDIR) || !(ip->i_d.di_mode & S_IFREG))

	if (!S_ISDIR(pip->i_d.di_mode) || !S_ISREG(ip->i_d.di_mode))

		return -EINVAL;

		return -EINVAL;





	mp = pip->i_mount;

	mp = pip->i_mount;