[PATCH 22/19] FS-Cache: NFS: Rename NFS_INO_CACHEABLE

Rename NFS_INO_CACHEABLE and NFS_CACHEABLE to be NFS_INO_FSCACHE and
NFS_FSCACHE.

Signed-Off-By: David Howells <[email protected]>
---

 fs/nfs/fscache.h       |    8 ++++----
 include/linux/nfs_fs.h |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/nfs/fscache.h b/fs/nfs/fscache.h
index 0be6ffe..b82b896 100644
--- a/fs/nfs/fscache.h
+++ b/fs/nfs/fscache.h
@@ -94,7 +94,7 @@ static inline void nfs_fscache_init_fh_c
 {
 	NFS_I(inode)->fscache = NULL;
 	if (S_ISREG(inode->i_mode))
-		set_bit(NFS_INO_CACHEABLE, &NFS_I(inode)->flags);
+		set_bit(NFS_INO_FSCACHE, &NFS_I(inode)->flags);
 }
 
 /*
@@ -105,7 +105,7 @@ static inline void nfs_fscache_enable_fh
 	struct super_block *sb = inode->i_sb;
 	struct nfs_inode *nfsi = NFS_I(inode);
 
-	if (nfsi->fscache || !NFS_CACHEABLE(inode))
+	if (nfsi->fscache || !NFS_FSCACHE(inode))
 		return;
 
 	if ((NFS_SB(sb)->flags & NFS_MOUNT_FSCACHE)) {
@@ -190,7 +190,7 @@ static inline void nfs_fscache_zap_fh_co
  */
 static inline void nfs_fscache_disable_fh_cookie(struct inode *inode)
 {
-	clear_bit(NFS_INO_CACHEABLE, &NFS_I(inode)->flags);
+	clear_bit(NFS_INO_FSCACHE, &NFS_I(inode)->flags);
 
 	if (NFS_I(inode)->fscache) {
 		dfprintk(FSCACHE,
@@ -214,7 +214,7 @@ static inline void nfs_fscache_disable_f
 static inline void nfs_fscache_set_fh_cookie(struct inode *inode,
 					     struct file *filp)
 {
-	if (NFS_CACHEABLE(inode)) {
+	if (NFS_FSCACHE(inode)) {
 		if ((filp->f_flags & O_ACCMODE) != O_RDONLY)
 			nfs_fscache_disable_fh_cookie(inode);
 		else
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index b2e5e86..59e433f 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -205,7 +205,7 @@ #define NFS_INO_REVALIDATING	(0)		/* rev
 #define NFS_INO_ADVISE_RDPLUS	(1)		/* advise readdirplus */
 #define NFS_INO_STALE		(2)		/* possible stale inode */
 #define NFS_INO_ACL_LRU_SET	(3)		/* Inode is on the LRU list */
-#define NFS_INO_CACHEABLE	(4)		/* inode can be cached by FS-Cache */
+#define NFS_INO_FSCACHE		(4)		/* inode can be cached by FS-Cache */
 
 static inline struct nfs_inode *NFS_I(struct inode *inode)
 {
@@ -231,7 +231,7 @@ #define NFS_ATTRTIMEO_UPDATE(inode)	(NFS
 
 #define NFS_FLAGS(inode)		(NFS_I(inode)->flags)
 #define NFS_STALE(inode)		(test_bit(NFS_INO_STALE, &NFS_FLAGS(inode)))
-#define NFS_CACHEABLE(inode)		(test_bit(NFS_INO_CACHEABLE, &NFS_FLAGS(inode)))
+#define NFS_FSCACHE(inode)		(test_bit(NFS_INO_FSCACHE, &NFS_FLAGS(inode)))
 
 #define NFS_FILEID(inode)		(NFS_I(inode)->fileid)
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• References:
  • [PATCH 00/19] Permit filesystem local caching and NFS superblock sharing
    • From: David Howells <[email protected]>

• Prev by Date: Re: Yet another borken page_count() check in invalidate_inode_pages2()....
• Next by Date: Re: [PATCH] ALSA: hda-intel - Disable MSI support by default
• Previous by thread: [PATCH 21/19] CacheFiles: Set the file creation security ID whilst binding the cache
• Next by thread: [PATCH 23/19] FS-Cache: NFS: Don't invoke FS-Cache from nfs_zap_caches()
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]