diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-04-09 14:12:07 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-04-09 14:12:07 -0500 |
| commit | dc2a5536d633dd2318f82f3d5ad3c9e43cfc21d7 (patch) | |
| tree | 20b68d90d175eb9f07cf19b2e8be4011a8e8e6e5 /fs/xfs/xfs_iomap.h | |
| parent | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (diff) | |
| parent | 8de2bf937a6bea8f0f775fd5399ba20c1a0c3d77 (diff) | |
Merge branch 'master' into for-linus
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 a1cc1322fc0..fdcf7b82747 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; |