xfs: do not use emums for flags used in tracing (807cbbdb) · Commits · 戴 / test

fs/xfs/linux-2.6/xfs_buf.h

+51 −51

Original line number	Diff line number	Diff line
		@@ -44,29 +44,28 @@ typedef enum {
		XBRW_ZERO = 3, /* Zero target memory */
		} xfs_buf_rw_t;

		typedef enum {
		XBF_READ = (1 << 0), /* buffer intended for reading from device */
		XBF_WRITE = (1 << 1), /* buffer intended for writing to device */
		XBF_MAPPED = (1 << 2), /* buffer mapped (b_addr valid) */
		XBF_ASYNC = (1 << 4), /* initiator will not wait for completion */
		XBF_DONE = (1 << 5), /* all pages in the buffer uptodate */
		XBF_DELWRI = (1 << 6), /* buffer has dirty pages */
		XBF_STALE = (1 << 7), /* buffer has been staled, do not find it */
		XBF_FS_MANAGED = (1 << 8), /* filesystem controls freeing memory */
		XBF_ORDERED = (1 << 11), /* use ordered writes */
		XBF_READ_AHEAD = (1 << 12), /* asynchronous read-ahead */
		XBF_LOG_BUFFER = (1 << 13), /* this is a buffer used for the log */
		#define XBF_READ (1 << 0) /* buffer intended for reading from device */
		#define XBF_WRITE (1 << 1) /* buffer intended for writing to device */
		#define XBF_MAPPED (1 << 2) /* buffer mapped (b_addr valid) */
		#define XBF_ASYNC (1 << 4) /* initiator will not wait for completion */
		#define XBF_DONE (1 << 5) /* all pages in the buffer uptodate */
		#define XBF_DELWRI (1 << 6) /* buffer has dirty pages */
		#define XBF_STALE (1 << 7) /* buffer has been staled, do not find it */
		#define XBF_FS_MANAGED (1 << 8) /* filesystem controls freeing memory */
		#define XBF_ORDERED (1 << 11)/* use ordered writes */
		#define XBF_READ_AHEAD (1 << 12)/* asynchronous read-ahead */
		#define XBF_LOG_BUFFER (1 << 13)/* this is a buffer used for the log */

		/* flags used only as arguments to access routines */
		XBF_LOCK = (1 << 14), /* lock requested */
		XBF_TRYLOCK = (1 << 15), /* lock requested, but do not wait */
		XBF_DONT_BLOCK = (1 << 16), /* do not block in current thread */
		#define XBF_LOCK (1 << 14)/* lock requested */
		#define XBF_TRYLOCK (1 << 15)/* lock requested, but do not wait */
		#define XBF_DONT_BLOCK (1 << 16)/* do not block in current thread */

		/* flags used only internally */
		_XBF_PAGE_CACHE = (1 << 17),/* backed by pagecache */
		_XBF_PAGES = (1 << 18), /* backed by refcounted pages */
		_XBF_RUN_QUEUES = (1 << 19),/* run block device task queue */
		_XBF_DELWRI_Q = (1 << 21), /* buffer on delwri queue */
		#define _XBF_PAGE_CACHE (1 << 17)/* backed by pagecache */
		#define _XBF_PAGES (1 << 18)/* backed by refcounted pages */
		#define _XBF_RUN_QUEUES (1 << 19)/* run block device task queue */
		#define _XBF_DELWRI_Q (1 << 21)/* buffer on delwri queue */

		/*
		* Special flag for supporting metadata blocks smaller than a FSB.
		@@ -85,7 +84,7 @@ typedef enum {
		* that require truncation and results in the AGI unlinked list
		* modifications being lost.
		*/
		_XBF_PAGE_LOCKED = (1 << 22),
		#define _XBF_PAGE_LOCKED (1 << 22)

		/*
		* If we try a barrier write, but it fails we have to communicate
		@@ -93,8 +92,9 @@ typedef enum {
		* when the buffer is re-issued so we have to add another flag to
		* keep this information.
		*/
		_XFS_BARRIER_FAILED = (1 << 23),
		} xfs_buf_flags_t;
		#define _XFS_BARRIER_FAILED (1 << 23)

		typedef unsigned int xfs_buf_flags_t;

		#define XFS_BUF_FLAGS \
		{ XBF_READ, "READ" }, \

fs/xfs/xfs_alloc.h

+10 −10

Original line number	Diff line number	Diff line
		@@ -27,16 +27,16 @@ struct xfs_busy_extent;
		/*
		* Freespace allocation types. Argument to xfs_alloc_[v]extent.
		*/
		typedef enum xfs_alloctype
		{
		XFS_ALLOCTYPE_ANY_AG, /* allocate anywhere, use rotor */
		XFS_ALLOCTYPE_FIRST_AG, /* ... start at ag 0 */
		XFS_ALLOCTYPE_START_AG, /* anywhere, start in this a.g. */
		XFS_ALLOCTYPE_THIS_AG, /* anywhere in this a.g. */
		XFS_ALLOCTYPE_START_BNO, /* near this block else anywhere */
		XFS_ALLOCTYPE_NEAR_BNO, /* in this a.g. and near this block */
		XFS_ALLOCTYPE_THIS_BNO /* at exactly this block */
		} xfs_alloctype_t;
		#define XFS_ALLOCTYPE_ANY_AG 0x01 /* allocate anywhere, use rotor */
		#define XFS_ALLOCTYPE_FIRST_AG 0x02 /* ... start at ag 0 */
		#define XFS_ALLOCTYPE_START_AG 0x04 /* anywhere, start in this a.g. */
		#define XFS_ALLOCTYPE_THIS_AG 0x08 /* anywhere in this a.g. */
		#define XFS_ALLOCTYPE_START_BNO 0x10 /* near this block else anywhere */
		#define XFS_ALLOCTYPE_NEAR_BNO 0x20 /* in this a.g. and near this block */
		#define XFS_ALLOCTYPE_THIS_BNO 0x40 /* at exactly this block */

		/* this should become an enum again when the tracing code is fixed */
		typedef unsigned int xfs_alloctype_t;

		#define XFS_ALLOC_TYPES \
		{ XFS_ALLOCTYPE_ANY_AG, "ANY_AG" }, \

fs/xfs/xfs_iomap.h

+10 −10

Original line number	Diff line number	Diff line
		@@ -18,16 +18,16 @@
		#ifndef __XFS_IOMAP_H__
		#define __XFS_IOMAP_H__

		typedef enum {
		/* base extent manipulation calls */
		BMAPI_READ = (1 << 0), /* read extents */
		BMAPI_WRITE = (1 << 1), /* create extents */
		BMAPI_ALLOCATE = (1 << 2), /* delayed allocate to real extents */
		#define BMAPI_READ (1 << 0) /* read extents */
		#define BMAPI_WRITE (1 << 1) /* create extents */
		#define BMAPI_ALLOCATE (1 << 2) /* delayed allocate to real extents */

		/* modifiers */
		BMAPI_IGNSTATE = (1 << 4), /* ignore unwritten state on read */
		BMAPI_DIRECT = (1 << 5), /* direct instead of buffered write */
		BMAPI_TRYLOCK = (1 << 7), /* non-blocking request */
		} bmapi_flags_t;
		#define BMAPI_IGNSTATE (1 << 4) /* ignore unwritten state on read */
		#define BMAPI_DIRECT (1 << 5) /* direct instead of buffered write */
		#define BMAPI_MMA (1 << 6) /* allocate for mmap write */
		#define BMAPI_TRYLOCK (1 << 7) /* non-blocking request */

		#define BMAPI_FLAGS \
		{ BMAPI_READ, "READ" }, \

Admin message