update to 2.6.9-rc1

[linux-flexiantxendom0-3.2.10.git] / fs / xfs / xfs_fsops.c

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 36bb461..4736fc4 100644 (file)
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -507,9 +507,9 @@ xfs_reserve_blocks(
        __uint64_t              *inval,
        xfs_fsop_resblks_t      *outval)
 {
-       __uint64_t              lcounter, delta;
-       __uint64_t              request;
-       unsigned long s;
+       __int64_t               lcounter, delta;
+       __uint64_t              request;
+       unsigned long           s;
 
        /* If inval is null, report current values and return */
 
@@ -536,8 +536,7 @@ xfs_reserve_blocks(
                mp->m_resblks = request;
        } else {
                delta = request - mp->m_resblks;
-               lcounter = mp->m_sb.sb_fdblocks;
-               lcounter -= delta;
+               lcounter = mp->m_sb.sb_fdblocks - delta;
                if (lcounter < 0) {
                        /* We can't satisfy the request, just get what we can */
                        mp->m_resblks += mp->m_sb.sb_fdblocks;