diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 13:11:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 13:11:25 -0700 |
| commit | a2308b7f0838406c346a2b0259ff88c7fcf41e79 (patch) | |
| tree | f0d6e3d05d301d3aadb7e8bdd42083be98e29e0d /fs/xfs/xfs_bmap.c | |
| parent | f27f0a045b79de5729d064497e21a70871f1d6fe (diff) | |
| parent | 1b895840ce93fd2d150a86c800a3085eaab4eb9e (diff) | |
| download | kernel_samsung_smdk4412-a2308b7f0838406c346a2b0259ff88c7fcf41e79.zip kernel_samsung_smdk4412-a2308b7f0838406c346a2b0259ff88c7fcf41e79.tar.gz kernel_samsung_smdk4412-a2308b7f0838406c346a2b0259ff88c7fcf41e79.tar.bz2 | |
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
* git://oss.sgi.com:8090/oss/git/xfs-2.6:
[XFS] Provide XFS support for the splice syscall.
[XFS] Reenable write barriers by default.
[XFS] Make project quota enforcement return an error code consistent with
[XFS] Implement the silent parameter to fill_super, previously ignored.
[XFS] Cleanup comment to remove reference to obsoleted function
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
| -rw-r--r-- | fs/xfs/xfs_bmap.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index d384e48..26939d3 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c @@ -4719,18 +4719,17 @@ xfs_bmapi( /* * Make a transaction-less quota reservation for * delayed allocation blocks. This number gets - * adjusted later. - * We return EDQUOT if we haven't allocated - * blks already inside this loop; + * adjusted later. We return if we haven't + * allocated blocks already inside this loop. */ - if (XFS_TRANS_RESERVE_QUOTA_NBLKS( + if ((error = XFS_TRANS_RESERVE_QUOTA_NBLKS( mp, NULL, ip, (long)alen, 0, rt ? XFS_QMOPT_RES_RTBLKS : - XFS_QMOPT_RES_REGBLKS)) { + XFS_QMOPT_RES_REGBLKS))) { if (n == 0) { *nmap = 0; ASSERT(cur == NULL); - return XFS_ERROR(EDQUOT); + return error; } break; } |