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

Commit b92cc59f authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: kill xfs_vnode.h 



Move the IO flag definitions to xfs_inode.h and kill the header file
as it is now empty.

Removing the xfs_vnode.h file showed up an implicit header include
path:
	xfs_linux.h -> xfs_vnode.h -> xfs_fs.h

And so every xfs header file has been inplicitly been including
xfs_fs.h where it is needed or not. Hence the removal of xfs_vnode.h
causes all sorts of build issues because BBTOB() and friends are no
longer automatically included in the build. This also gets fixed.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent dd8c38ba

fs/xfs/xfs_file.c

+5 −5
Original line number Diff line number Diff line
@@ -246,11 +246,11 @@ xfs_file_read_iter( 
	XFS_STATS_INC(xs_read_calls);



	if (unlikely(file->f_flags & O_DIRECT))

		ioflags |= IO_ISDIRECT;

		ioflags |= XFS_IO_ISDIRECT;

	if (file->f_mode & FMODE_NOCMTIME)

		ioflags |= IO_INVIS;

		ioflags |= XFS_IO_INVIS;



	if (unlikely(ioflags & IO_ISDIRECT)) {

	if (unlikely(ioflags & XFS_IO_ISDIRECT)) {

		xfs_buftarg_t	*target =

			XFS_IS_REALTIME_INODE(ip) ?

				mp->m_rtdev_targp : mp->m_ddev_targp;
@@ -283,7 +283,7 @@ xfs_file_read_iter( 
	 * proceeed concurrently without serialisation.

	 */

	xfs_rw_ilock(ip, XFS_IOLOCK_SHARED);

	if ((ioflags & IO_ISDIRECT) && inode->i_mapping->nrpages) {

	if ((ioflags & XFS_IO_ISDIRECT) && inode->i_mapping->nrpages) {

		xfs_rw_iunlock(ip, XFS_IOLOCK_SHARED);

		xfs_rw_ilock(ip, XFS_IOLOCK_EXCL);
@@ -325,7 +325,7 @@ xfs_file_splice_read( 
	XFS_STATS_INC(xs_read_calls);



	if (infilp->f_mode & FMODE_NOCMTIME)

		ioflags |= IO_INVIS;

		ioflags |= XFS_IO_INVIS;



	if (XFS_FORCED_SHUTDOWN(ip->i_mount))

		return -EIO;

fs/xfs/xfs_inode.h

+10 −0
Original line number Diff line number Diff line
@@ -398,4 +398,14 @@ do { \ 


extern struct kmem_zone	*xfs_inode_zone;



/*

 * Flags for read/write calls

 */

#define XFS_IO_ISDIRECT	0x00001		/* bypass page cache */

#define XFS_IO_INVIS	0x00002		/* don't update inode timestamps */



#define XFS_IO_FLAGS \

	{ XFS_IO_ISDIRECT,	"DIRECT" }, \

	{ XFS_IO_INVIS,		"INVIS"}



#endif	/* __XFS_INODE_H__ */

fs/xfs/xfs_ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ xfs_ioc_space( 
	xfs_ilock(ip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);



	if (!(ioflags & IO_INVIS)) {

	if (!(ioflags & XFS_IO_INVIS)) {

		ip->i_d.di_mode &= ~S_ISUID;

		if (ip->i_d.di_mode & S_IXGRP)

			ip->i_d.di_mode &= ~S_ISGID;
@@ -1376,7 +1376,7 @@ xfs_ioc_getbmap( 
		return -EINVAL;



	bmx.bmv_iflags = (cmd == XFS_IOC_GETBMAPA ? BMV_IF_ATTRFORK : 0);

	if (ioflags & IO_INVIS)

	if (ioflags & XFS_IO_INVIS)

		bmx.bmv_iflags |= BMV_IF_NO_DMAPI_READ;



	error = xfs_getbmap(ip, &bmx, xfs_getbmap_format,
@@ -1520,7 +1520,7 @@ xfs_file_ioctl( 
	int			error;



	if (filp->f_mode & FMODE_NOCMTIME)

		ioflags |= IO_INVIS;

		ioflags |= XFS_IO_INVIS;



	trace_xfs_file_ioctl(ip);

fs/xfs/xfs_ioctl32.c

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_mount.h"

#include "xfs_vnode.h"

#include "xfs_inode.h"

#include "xfs_itable.h"

#include "xfs_error.h"
@@ -537,7 +536,7 @@ xfs_file_compat_ioctl( 
	int			error;



	if (filp->f_mode & FMODE_NOCMTIME)

		ioflags |= IO_INVIS;

		ioflags |= XFS_IO_INVIS;



	trace_xfs_file_compat_ioctl(ip);

fs/xfs/xfs_linux.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ typedef __uint64_t __psunsigned_t; 
#include <asm/byteorder.h>

#include <asm/unaligned.h>



#include "xfs_vnode.h"

#include "xfs_fs.h"

#include "xfs_stats.h"

#include "xfs_sysctl.h"

#include "xfs_iops.h"