Commit 5e6bcb48 authored by Bobi Jam's avatar Bobi Jam Committed by Greg Kroah-Hartman
Browse files

staging: lustre: fiemap: set FIEMAP_EXTENT_LAST correctly 



When we've collected enough extents as user requested, we'd check one
further to decide whether we've reached the last extent of the file.

Signed-off-by: default avatarBobi Jam <bobijam.xu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5933
Reviewed-on: http://review.whamcloud.com/12781


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c86a6c11

drivers/staging/lustre/lustre/lov/lov_obd.c

+10 −2
Original line number Diff line number Diff line
@@ -1548,6 +1548,8 @@ static int lov_fiemap(struct lov_obd *lov, __u32 keylen, void *key, 
	u64 fm_start, fm_end, fm_length, fm_end_offset;

	u64 curr_loc;

	int current_extent = 0, rc = 0, i;

	/* Whether have we collected enough extents */

	bool enough = false;

	int ost_eof = 0; /* EOF for object */

	int ost_done = 0; /* done with required mapping for this OST? */

	int last_stripe;
@@ -1682,7 +1684,7 @@ static int lov_fiemap(struct lov_obd *lov, __u32 keylen, void *key, 
			lun_start += len_mapped_single_call;

			fm_local->fm_length = req_fm_len - len_mapped_single_call;

			req_fm_len = fm_local->fm_length;

			fm_local->fm_extent_count = count_local;

			fm_local->fm_extent_count = enough ? 1 : count_local;

			fm_local->fm_mapped_extents = 0;

			fm_local->fm_flags = fiemap->fm_flags;
@@ -1730,6 +1732,12 @@ static int lov_fiemap(struct lov_obd *lov, __u32 keylen, void *key, 
					goto finish;

				}

				break;

			} else if (enough) {

				/*

				 * We've collected enough extents and there are

				 * more extents after it.

				 */

				goto finish;

			}



			/* If we just need num of extents then go to next device */
@@ -1769,7 +1777,7 @@ static int lov_fiemap(struct lov_obd *lov, __u32 keylen, void *key, 


			/* Ran out of available extents? */

			if (current_extent >= fiemap->fm_extent_count)

				goto finish;

				enough = true;

		} while (ost_done == 0 && ost_eof == 0);



		if (cur_stripe_wrap == last_stripe)