diff options
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_iomap.c | 8 | ||||
-rw-r--r-- | fs/xfs/xfs_iomap.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index bf57b75acb90..72786e356d56 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c | |||
@@ -135,14 +135,10 @@ xfs_imap_to_bmap( | |||
135 | int flags) | 135 | int flags) |
136 | { | 136 | { |
137 | xfs_mount_t *mp; | 137 | xfs_mount_t *mp; |
138 | xfs_fsize_t nisize; | ||
139 | int pbm; | 138 | int pbm; |
140 | xfs_fsblock_t start_block; | 139 | xfs_fsblock_t start_block; |
141 | 140 | ||
142 | mp = io->io_mount; | 141 | mp = io->io_mount; |
143 | nisize = XFS_SIZE(mp, io); | ||
144 | if (io->io_new_size > nisize) | ||
145 | nisize = io->io_new_size; | ||
146 | 142 | ||
147 | for (pbm = 0; imaps && pbm < iomaps; imaps--, iomapp++, imap++, pbm++) { | 143 | for (pbm = 0; imaps && pbm < iomaps; imaps--, iomapp++, imap++, pbm++) { |
148 | iomapp->iomap_offset = XFS_FSB_TO_B(mp, imap->br_startoff); | 144 | iomapp->iomap_offset = XFS_FSB_TO_B(mp, imap->br_startoff); |
@@ -169,10 +165,6 @@ xfs_imap_to_bmap( | |||
169 | iomapp->iomap_flags |= IOMAP_UNWRITTEN; | 165 | iomapp->iomap_flags |= IOMAP_UNWRITTEN; |
170 | } | 166 | } |
171 | 167 | ||
172 | if ((iomapp->iomap_offset + iomapp->iomap_bsize) >= nisize) { | ||
173 | iomapp->iomap_flags |= IOMAP_EOF; | ||
174 | } | ||
175 | |||
176 | offset += iomapp->iomap_bsize - iomapp->iomap_delta; | 168 | offset += iomapp->iomap_bsize - iomapp->iomap_delta; |
177 | } | 169 | } |
178 | return pbm; /* Return the number filled */ | 170 | return pbm; /* Return the number filled */ |
diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h index df441ee936b2..f5c09887fe93 100644 --- a/fs/xfs/xfs_iomap.h +++ b/fs/xfs/xfs_iomap.h | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | typedef enum { /* iomap_flags values */ | 24 | typedef enum { /* iomap_flags values */ |
25 | IOMAP_READ = 0, /* mapping for a read */ | 25 | IOMAP_READ = 0, /* mapping for a read */ |
26 | IOMAP_EOF = 0x01, /* mapping contains EOF */ | ||
27 | IOMAP_HOLE = 0x02, /* mapping covers a hole */ | 26 | IOMAP_HOLE = 0x02, /* mapping covers a hole */ |
28 | IOMAP_DELAY = 0x04, /* mapping covers delalloc region */ | 27 | IOMAP_DELAY = 0x04, /* mapping covers delalloc region */ |
29 | IOMAP_REALTIME = 0x10, /* mapping on the realtime device */ | 28 | IOMAP_REALTIME = 0x10, /* mapping on the realtime device */ |