diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /fs/reiserfs/file.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'fs/reiserfs/file.c')
| -rw-r--r-- | fs/reiserfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index c20babd6216d..7892a865b58a 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c | |||
| @@ -251,12 +251,12 @@ static int reiserfs_allocate_blocks_for_region(struct reiserfs_transaction_handl | |||
| 251 | blocks_to_allocate, | 251 | blocks_to_allocate, |
| 252 | blocks_to_allocate); | 252 | blocks_to_allocate); |
| 253 | if (res != CARRY_ON) { | 253 | if (res != CARRY_ON) { |
| 254 | res = -ENOSPC; | 254 | res = res == QUOTA_EXCEEDED ? -EDQUOT : -ENOSPC; |
| 255 | pathrelse(&path); | 255 | pathrelse(&path); |
| 256 | goto error_exit; | 256 | goto error_exit; |
| 257 | } | 257 | } |
| 258 | } else { | 258 | } else { |
| 259 | res = -ENOSPC; | 259 | res = res == QUOTA_EXCEEDED ? -EDQUOT : -ENOSPC; |
| 260 | pathrelse(&path); | 260 | pathrelse(&path); |
| 261 | goto error_exit; | 261 | goto error_exit; |
| 262 | } | 262 | } |