Merge Linus' tree to be be to apply submitted patches to newer code than

current trivial.git base

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/nfsd/export.h b/fs/nfsd/export.h
index cfeea85c5be..04dc8c167b0 100644
--- a/fs/nfsd/export.h
+++ b/fs/nfsd/export.h
@@ -101,9 +101,10 @@ static inline void exp_put(struct svc_export *exp)
 	cache_put(&exp->h, exp->cd);
 }
 
-static inline void exp_get(struct svc_export *exp)
+static inline struct svc_export *exp_get(struct svc_export *exp)
 {
 	cache_get(&exp->h);
+	return exp;
 }
 struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *);