Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c34691a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: ensure bdi_unregister is called on mount failure.
  NFS: Avoid a deadlock in nfs_release_page
  NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode()
  nfs4: Make the v4 callback service hidden
  nfs: fix unlikely memory leak
  rpc client can not deal with ENOSOCK, so translate it into ENOCONN
parents 5f87e54d cfbc0683

fs/nfs/callback_xdr.c

+1 −0
Original line number Diff line number Diff line
@@ -782,6 +782,7 @@ struct svc_version nfs4_callback_version1 = { 
	.vs_proc = nfs4_callback_procedures1,

	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,

	.vs_dispatch = NULL,

	.vs_hidden = 1,

};



struct svc_version nfs4_callback_version4 = {

fs/nfs/delegation.h

+6 −0
Original line number Diff line number Diff line
@@ -71,4 +71,10 @@ static inline int nfs_inode_return_delegation(struct inode *inode) 
}

#endif



static inline int nfs_have_delegated_attributes(struct inode *inode)

{

	return nfs_have_delegation(inode, FMODE_READ) &&

		!(NFS_I(inode)->cache_validity & NFS_INO_REVAL_FORCED);

}



#endif

fs/nfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1789,7 +1789,7 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str 
	cache = nfs_access_search_rbtree(inode, cred);

	if (cache == NULL)

		goto out;

	if (!nfs_have_delegation(inode, FMODE_READ) &&

	if (!nfs_have_delegated_attributes(inode) &&

	    !time_in_range_open(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo))

		goto out_stale;

	res->jiffies = cache->jiffies;

fs/nfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ int nfs_attribute_timeout(struct inode *inode) 
{

	struct nfs_inode *nfsi = NFS_I(inode);



	if (nfs_have_delegation(inode, FMODE_READ))

	if (nfs_have_delegated_attributes(inode))

		return 0;

	return !time_in_range_open(jiffies, nfsi->read_cache_jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo);

}

fs/nfs/nfs4proc.c

+1 −0
Original line number Diff line number Diff line
@@ -5107,6 +5107,7 @@ static int nfs41_proc_async_sequence(struct nfs_client *clp, 
	res = kzalloc(sizeof(*res), GFP_KERNEL);

	if (!args || !res) {

		kfree(args);

		kfree(res);

		nfs_put_client(clp);

		return -ENOMEM;

	}