From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:52341 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932154AbeFTTjZ (ORCPT ); Wed, 20 Jun 2018 15:39:25 -0400 From: Goldwyn Rodrigues To: linux-fsdevel@vger.kernel.org Cc: dhowells@redhat.com, viro@ZenIV.linux.org.uk, Goldwyn Rodrigues Subject: [PATCH 2/3] Revert: "VFS: Add a whiteout dentry type" Date: Wed, 20 Jun 2018 14:39:09 -0500 Message-Id: <20180620193910.6804-3-rgoldwyn@suse.de> In-Reply-To: <20180620193910.6804-1-rgoldwyn@suse.de> References: <20180620193910.6804-1-rgoldwyn@suse.de> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Goldwyn Rodrigues Reverts e7f7d2253c05 ("VFS: Add a whiteout dentry type") No users of DCACHE_WHITEOUT_TYPE. Overlay uses its own flags to represent whiteouts. d_is_miss() is not used. Signed-off-by: Goldwyn Rodrigues --- include/linux/dcache.h | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 39d377ba4208..6bb1ba14af8d 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -202,13 +202,13 @@ struct dentry_operations { #define DCACHE_LRU_LIST 0x00080000 #define DCACHE_ENTRY_TYPE 0x00700000 -#define DCACHE_MISS_TYPE 0x00000000 /* Negative dentry (maybe fallthru to nowhere) */ +#define DCACHE_MISS_TYPE 0x00000000 /* Negative dentry */ #define DCACHE_WHITEOUT_TYPE 0x00100000 /* Whiteout dentry (stop pathwalk) */ #define DCACHE_DIRECTORY_TYPE 0x00200000 /* Normal directory */ #define DCACHE_AUTODIR_TYPE 0x00300000 /* Lookupless directory (presumed automount) */ -#define DCACHE_REGULAR_TYPE 0x00400000 /* Regular file type (or fallthru to such) */ -#define DCACHE_SPECIAL_TYPE 0x00500000 /* Other file type (or fallthru to such) */ -#define DCACHE_SYMLINK_TYPE 0x00600000 /* Symlink (or fallthru to such) */ +#define DCACHE_REGULAR_TYPE 0x00400000 /* Regular file type */ +#define DCACHE_SPECIAL_TYPE 0x00500000 /* Other file type */ +#define DCACHE_SYMLINK_TYPE 0x00600000 /* Symlink */ #define DCACHE_MAY_FREE 0x00800000 #define DCACHE_ENCRYPTED_WITH_KEY 0x02000000 /* dir is encrypted with a valid key */ @@ -393,16 +393,6 @@ static inline unsigned __d_entry_type(const struct dentry *dentry) return dentry->d_flags & DCACHE_ENTRY_TYPE; } -static inline bool d_is_miss(const struct dentry *dentry) -{ - return __d_entry_type(dentry) == DCACHE_MISS_TYPE; -} - -static inline bool d_is_whiteout(const struct dentry *dentry) -{ - return __d_entry_type(dentry) == DCACHE_WHITEOUT_TYPE; -} - static inline bool d_can_lookup(const struct dentry *dentry) { return __d_entry_type(dentry) == DCACHE_DIRECTORY_TYPE; @@ -440,8 +430,7 @@ static inline bool d_is_file(const struct dentry *dentry) static inline bool d_is_negative(const struct dentry *dentry) { - // TODO: check d_is_whiteout(dentry) also. - return d_is_miss(dentry); + return __d_entry_type(dentry) == DCACHE_MISS_TYPE; } static inline bool d_is_positive(const struct dentry *dentry) -- 2.16.4