diff options
author | Theodore Ts'o <tytso@mit.edu> | 2015-06-21 01:25:29 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2015-06-21 01:25:29 -0400 |
commit | c5e298ae53dc2eb69f2f7153be03454c8a33c658 (patch) | |
tree | 07bd2e74badcff3d55627b2f315b1640bbde15d8 /fs/ext4/extents.c | |
parent | 89d96a6f8e6491f24fc8f99fd6ae66820e85c6c1 (diff) | |
download | talos-obmc-linux-c5e298ae53dc2eb69f2f7153be03454c8a33c658.tar.gz talos-obmc-linux-c5e298ae53dc2eb69f2f7153be03454c8a33c658.zip |
ext4: prevent ext4_quota_write() from failing due to ENOSPC
In order to prevent quota block tracking to be inaccurate when
ext4_quota_write() fails with ENOSPC, we make two changes. The quota
file can now use the reserved block (since the quota file is arguably
file system metadata), and ext4_quota_write() now uses
ext4_should_retry_alloc() to retry the block allocation after a commit
has completed and released some blocks for allocation.
This fixes failures of xfstests generic/270:
Quota error (device vdc): write_blk: dquota write failed
Quota error (device vdc): qtree_write_dquot: Error -28 occurred while creating quota
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/extents.c')
-rw-r--r-- | fs/ext4/extents.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 1ba8b4ab03a8..d86d2622f826 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4456,6 +4456,8 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, ar.flags |= EXT4_MB_HINT_NOPREALLOC; if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) ar.flags |= EXT4_MB_DELALLOC_RESERVED; + if (flags & EXT4_GET_BLOCKS_METADATA_NOFAIL) + ar.flags |= EXT4_MB_USE_RESERVED; newblock = ext4_mb_new_blocks(handle, &ar, &err); if (!newblock) goto out2; |