From: David Woodhouse Date: Sat, 12 Sep 2009 05:35:37 +0000 (+0200) Subject: Make DISCARD_BARRIER and DISCARD_NOBARRIER writes instead of reads X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3d2257f157c2324acbc0fa0fa54e8626a987edd2;p=linux-beck.git Make DISCARD_BARRIER and DISCARD_NOBARRIER writes instead of reads The commands are conceptually writes, and in the case of IDE and SCSI commands actually are writes. They were only reads because we thought that would interact better with the elevators. Now the elevators know about discard requests, that advantage no longer exists. Signed-off-by: David Woodhouse Signed-off-by: Matthew Wilcox Signed-off-by: Jens Axboe --- diff --git a/include/linux/fs.h b/include/linux/fs.h index c1f993515f51..7f5a8ad25008 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -161,8 +161,8 @@ struct inodes_stat_t { * These aren't really reads or writes, they pass down information about * parts of device that are now unused by the file system. */ -#define DISCARD_NOBARRIER (1 << BIO_RW_DISCARD) -#define DISCARD_BARRIER ((1 << BIO_RW_DISCARD) | (1 << BIO_RW_BARRIER)) +#define DISCARD_NOBARRIER (WRITE | (1 << BIO_RW_DISCARD)) +#define DISCARD_BARRIER (DISCARD_NOBARRIER | (1 << BIO_RW_BARRIER)) #define SEL_IN 1 #define SEL_OUT 2