Commit 3a10c30a authored by Benny Halevy's avatar Benny Halevy Committed by Trond Myklebust
Browse files

nfs: obliterate NFS_FLAGS macro 



use NFS_I(inode)->flags instead

Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent fc601477

fs/nfs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page) 
		/* We requested READDIRPLUS, but the server doesn't grok it */

		if (error == -ENOTSUPP && desc->plus) {

			NFS_SERVER(inode)->caps &= ~NFS_CAP_READDIRPLUS;

			clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_FLAGS(inode));

			clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);

			desc->plus = 0;

			goto again;

		}
@@ -577,7 +577,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
			break;

		}

		if (res == -ETOOSMALL && desc->plus) {

			clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_FLAGS(inode));

			clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);

			nfs_zap_caches(inode);

			desc->plus = 0;

			desc->entry->eof = 0;
@@ -1760,7 +1760,7 @@ static void __nfs_access_zap_cache(struct inode *inode) 
void nfs_access_zap_cache(struct inode *inode)

{

	/* Remove from global LRU init */

	if (test_and_clear_bit(NFS_INO_ACL_LRU_SET, &NFS_FLAGS(inode))) {

	if (test_and_clear_bit(NFS_INO_ACL_LRU_SET, &NFS_I(inode)->flags)) {

		spin_lock(&nfs_access_lru_lock);

		list_del_init(&NFS_I(inode)->access_cache_inode_lru);

		spin_unlock(&nfs_access_lru_lock);
@@ -1874,7 +1874,7 @@ static void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *s 
	smp_mb__after_atomic_inc();



	/* Add inode to global LRU list */

	if (!test_and_set_bit(NFS_INO_ACL_LRU_SET, &NFS_FLAGS(inode))) {

	if (!test_and_set_bit(NFS_INO_ACL_LRU_SET, &NFS_I(inode)->flags)) {

		spin_lock(&nfs_access_lru_lock);

		list_add_tail(&NFS_I(inode)->access_cache_inode_lru, &nfs_access_lru_list);

		spin_unlock(&nfs_access_lru_lock);

fs/nfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ void nfs_invalidate_atime(struct inode *inode) 
 */

static void nfs_invalidate_inode(struct inode *inode)

{

	set_bit(NFS_INO_STALE, &NFS_FLAGS(inode));

	set_bit(NFS_INO_STALE, &NFS_I(inode)->flags);

	nfs_zap_caches_locked(inode);

}
@@ -291,7 +291,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr) 
			inode->i_fop = &nfs_dir_operations;

			if (nfs_server_capable(inode, NFS_CAP_READDIRPLUS)

			    && fattr->size <= NFS_LIMIT_READDIRPLUS)

				set_bit(NFS_INO_ADVISE_RDPLUS, &NFS_FLAGS(inode));

				set_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);

			/* Deal with crossing mountpoints */

			if (!nfs_fsid_equal(&NFS_SB(sb)->fsid, &fattr->fsid)) {

				if (fattr->valid & NFS_ATTR_FATTR_V4_REFERRAL)
@@ -668,7 +668,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 
		if (status == -ESTALE) {

			nfs_zap_caches(inode);

			if (!S_ISDIR(inode->i_mode))

				set_bit(NFS_INO_STALE, &NFS_FLAGS(inode));

				set_bit(NFS_INO_STALE, &NFS_I(inode)->flags);

		}

		goto out;

	}

fs/nfs/read.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ int nfs_readpage_result(struct rpc_task *task, struct nfs_read_data *data) 
	nfs_add_stats(data->inode, NFSIOS_SERVERREADBYTES, data->res.count);



	if (task->tk_status == -ESTALE) {

		set_bit(NFS_INO_STALE, &NFS_FLAGS(data->inode));

		set_bit(NFS_INO_STALE, &NFS_I(data->inode)->flags);

		nfs_mark_for_revalidate(data->inode);

	}

	return 0;

include/linux/nfs_fs.h

+2 −3
Original line number Diff line number Diff line
@@ -214,8 +214,7 @@ static inline struct nfs_inode *NFS_I(struct inode *inode) 
	(S_ISDIR(inode->i_mode)? NFS_SERVER(inode)->acdirmax \

			       : NFS_SERVER(inode)->acregmax)



#define NFS_FLAGS(inode)		(NFS_I(inode)->flags)

#define NFS_STALE(inode)		(test_bit(NFS_INO_STALE, &NFS_FLAGS(inode)))

#define NFS_STALE(inode)		(test_bit(NFS_INO_STALE, &NFS_I(inode)->flags))



#define NFS_FILEID(inode)		(NFS_I(inode)->fileid)
@@ -237,7 +236,7 @@ static inline int nfs_server_capable(struct inode *inode, int cap) 


static inline int NFS_USE_READDIRPLUS(struct inode *inode)

{

	return test_bit(NFS_INO_ADVISE_RDPLUS, &NFS_FLAGS(inode));

	return test_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);

}



static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)