diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 14:35:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 14:35:13 -0700 |
| commit | 3c1795cc4bd9d57281bebc314315b8afa217b9c7 (patch) | |
| tree | 97972fe4970e5074ec3944c7cd5179fb2bfe5b36 /fs/xfs/xfs_iomap.h | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
| parent | dc2a5536d633dd2318f82f3d5ad3c9e43cfc21d7 (diff) | |
| download | lwn-3c1795cc4bd9d57281bebc314315b8afa217b9c7.tar.gz lwn-3c1795cc4bd9d57281bebc314315b8afa217b9c7.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: remove xfs_flush_space
xfs: flush delayed allcoation blocks on ENOSPC in create
xfs: block callers of xfs_flush_inodes() correctly
xfs: make inode flush at ENOSPC synchronous
xfs: use xfs_sync_inodes() for device flushing
xfs: inform the xfsaild of the push target before sleeping
xfs: prevent unwritten extent conversion from blocking I/O completion
xfs: fix double free of inode
xfs: validate log feature fields correctly
Diffstat (limited to 'fs/xfs/xfs_iomap.h')
| -rw-r--r-- | fs/xfs/xfs_iomap.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h index a1cc1322fc0f..fdcf7b82747f 100644 --- a/fs/xfs/xfs_iomap.h +++ b/fs/xfs/xfs_iomap.h @@ -40,8 +40,7 @@ typedef enum { BMAPI_IGNSTATE = (1 << 4), /* ignore unwritten state on read */ BMAPI_DIRECT = (1 << 5), /* direct instead of buffered write */ BMAPI_MMAP = (1 << 6), /* allocate for mmap write */ - BMAPI_SYNC = (1 << 7), /* sync write to flush delalloc space */ - BMAPI_TRYLOCK = (1 << 8), /* non-blocking request */ + BMAPI_TRYLOCK = (1 << 7), /* non-blocking request */ } bmapi_flags_t; |