From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:52337 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932847AbeFTTjX (ORCPT ); Wed, 20 Jun 2018 15:39:23 -0400 From: Goldwyn Rodrigues To: linux-fsdevel@vger.kernel.org Cc: dhowells@redhat.com, viro@ZenIV.linux.org.uk, Goldwyn Rodrigues Subject: [PATCH 1/3] Revert: "VFS: Add a fallthrough flag for marking virtual dentries" Date: Wed, 20 Jun 2018 14:39:08 -0500 Message-Id: <20180620193910.6804-2-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: df1a085af1f6 ("VFS: Add a fallthrough flag for marking virtual dentries") No users of DCACHE_FALLTHRU. Signed-off-by: Goldwyn Rodrigues --- fs/dcache.c | 20 ++------------------ include/linux/dcache.h | 9 --------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index 0e8e5de3c48a..710afa5d9364 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -318,7 +318,7 @@ static inline void __d_set_inode_and_type(struct dentry *dentry, dentry->d_inode = inode; flags = READ_ONCE(dentry->d_flags); - flags &= ~(DCACHE_ENTRY_TYPE | DCACHE_FALLTHRU); + flags &= ~DCACHE_ENTRY_TYPE; flags |= type_flags; WRITE_ONCE(dentry->d_flags, flags); } @@ -327,7 +327,7 @@ static inline void __d_clear_type_and_inode(struct dentry *dentry) { unsigned flags = READ_ONCE(dentry->d_flags); - flags &= ~(DCACHE_ENTRY_TYPE | DCACHE_FALLTHRU); + flags &= ~DCACHE_ENTRY_TYPE; WRITE_ONCE(dentry->d_flags, flags); dentry->d_inode = NULL; } @@ -1785,22 +1785,6 @@ void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op) } EXPORT_SYMBOL(d_set_d_op); - -/* - * d_set_fallthru - Mark a dentry as falling through to a lower layer - * @dentry - The dentry to mark - * - * Mark a dentry as falling through to the lower layer (as set with - * d_pin_lower()). This flag may be recorded on the medium. - */ -void d_set_fallthru(struct dentry *dentry) -{ - spin_lock(&dentry->d_lock); - dentry->d_flags |= DCACHE_FALLTHRU; - spin_unlock(&dentry->d_lock); -} -EXPORT_SYMBOL(d_set_fallthru); - static unsigned d_flags_for_inode(struct inode *inode) { unsigned add_flags = DCACHE_REGULAR_TYPE; diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 66c6e17e61e5..39d377ba4208 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -211,7 +211,6 @@ struct dentry_operations { #define DCACHE_SYMLINK_TYPE 0x00600000 /* Symlink (or fallthru to such) */ #define DCACHE_MAY_FREE 0x00800000 -#define DCACHE_FALLTHRU 0x01000000 /* Fall through to lower layer */ #define DCACHE_ENCRYPTED_WITH_KEY 0x02000000 /* dir is encrypted with a valid key */ #define DCACHE_OP_REAL 0x04000000 @@ -493,14 +492,6 @@ static inline int simple_positive(const struct dentry *dentry) return d_really_is_positive(dentry) && !d_unhashed(dentry); } -extern void d_set_fallthru(struct dentry *dentry); - -static inline bool d_is_fallthru(const struct dentry *dentry) -{ - return dentry->d_flags & DCACHE_FALLTHRU; -} - - extern int sysctl_vfs_cache_pressure; static inline unsigned long vfs_pressure_ratio(unsigned long val) -- 2.16.4