diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /fs/xfs/xfs_bmap.c | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
| -rw-r--r-- | fs/xfs/xfs_bmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 3a6137539064..bf46fae303af 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c | |||
| @@ -4993,7 +4993,7 @@ xfs_bmapi( | |||
| 4993 | bma.firstblock = *firstblock; | 4993 | bma.firstblock = *firstblock; |
| 4994 | bma.alen = alen; | 4994 | bma.alen = alen; |
| 4995 | bma.off = aoff; | 4995 | bma.off = aoff; |
| 4996 | bma.conv = (flags & XFS_BMAPI_CONVERT); | 4996 | bma.conv = !!(flags & XFS_BMAPI_CONVERT); |
| 4997 | bma.wasdel = wasdelay; | 4997 | bma.wasdel = wasdelay; |
| 4998 | bma.minlen = minlen; | 4998 | bma.minlen = minlen; |
| 4999 | bma.low = flist->xbf_low; | 4999 | bma.low = flist->xbf_low; |