Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0573aa06 authored by Damien Le Moal's avatar Damien Le Moal Committed by Jaegeuk Kim
Browse files

f2fs: Reset sequential zones on zoned block devices 



commit f46e8809e88d113ba096bcfc772b5182ce00b941 upstream.

When a zoned block device is mounted, discarding sections
contained in sequential zones must reset the zone write pointer.
For sections contained in conventional zones, the regular discard
is used if the drive supports it.

Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 018fc18e

fs/f2fs/segment.c

+45 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/kthread.h>

#include <linux/kthread.h>

#include <linux/swap.h>

#include <linux/swap.h>

#include <linux/timer.h>

#include <linux/timer.h>

#include <linux/timer.h>





#include "f2fs.h"

#include "f2fs.h"

#include "segment.h"

#include "segment.h"
@@ -584,6 +585,45 @@ static void locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno) 
	mutex_unlock(&dirty_i->seglist_lock);

	mutex_unlock(&dirty_i->seglist_lock);

}

}





#ifdef CONFIG_BLK_DEV_ZONED

static int f2fs_issue_discard_zone(struct f2fs_sb_info *sbi,

					block_t blkstart, block_t blklen)

{

	sector_t sector = SECTOR_FROM_BLOCK(blkstart);

	sector_t nr_sects = SECTOR_FROM_BLOCK(blklen);

	struct block_device *bdev = sbi->sb->s_bdev;



	if (nr_sects != bdev_zone_size(bdev)) {

		f2fs_msg(sbi->sb, KERN_INFO,

			 "Unaligned discard attempted (sector %llu + %llu)",

			 (unsigned long long)sector,

			 (unsigned long long)nr_sects);

		return -EIO;

	}



	/*

	 * We need to know the type of the zone: for conventional zones,

	 * use regular discard if the drive supports it. For sequential

	 * zones, reset the zone write pointer.

	 */

	switch (get_blkz_type(sbi, blkstart)) {



	case BLK_ZONE_TYPE_CONVENTIONAL:

		if (!blk_queue_discard(bdev_get_queue(bdev)))

			return 0;

		return blkdev_issue_discard(bdev, sector, nr_sects,

						GFP_NOFS, 0);

	case BLK_ZONE_TYPE_SEQWRITE_REQ:

	case BLK_ZONE_TYPE_SEQWRITE_PREF:

		return blkdev_reset_zones(bdev, sector,

					  nr_sects, GFP_NOFS);

	default:

		/* Unknown zone type: broken device ? */

		return -EIO;

	}

}

#endif



static int f2fs_issue_discard(struct f2fs_sb_info *sbi,

static int f2fs_issue_discard(struct f2fs_sb_info *sbi,

				block_t blkstart, block_t blklen)

				block_t blkstart, block_t blklen)

{

{
@@ -601,6 +641,11 @@ static int f2fs_issue_discard(struct f2fs_sb_info *sbi, 
			sbi->discard_blks--;

			sbi->discard_blks--;

	}

	}

	trace_f2fs_issue_discard(sbi->sb, blkstart, blklen);

	trace_f2fs_issue_discard(sbi->sb, blkstart, blklen);



#ifdef CONFIG_BLK_DEV_ZONED

	if (f2fs_sb_mounted_blkzoned(sbi->sb))

		return f2fs_issue_discard_zone(sbi, blkstart, blklen);

#endif

	return blkdev_issue_discard(sbi->sb->s_bdev, start, len, GFP_NOFS, 0);

	return blkdev_issue_discard(sbi->sb->s_bdev, start, len, GFP_NOFS, 0);

}

}