From 6d437c75fc83918982db43670a80d1019c46a67c Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 12 Sep 2009 07:35:37 +0200 Subject: [PATCH] --- yaml --- r: 161226 b: refs/heads/master c: 3d2257f157c2324acbc0fa0fa54e8626a987edd2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/fs.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c9f8b5b161cc..cc5f5a932efb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8a9ae779f2c7049071034661e09cb7e1e82250c +refs/heads/master: 3d2257f157c2324acbc0fa0fa54e8626a987edd2 diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index c1f993515f51..7f5a8ad25008 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/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