From 5e697b54d9670b30bca6f713301b5f832cb96f6b Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Fri, 23 Mar 2012 14:40:56 -0400
Subject: [PATCH] --- yaml --- r: 297975 b: refs/heads/master c:
 35ebb4155f2f9d5580679d368aea81a5933db481 h: refs/heads/master i:   297973:
 0c8014feab3f91bd0a97ee9d9a218fa658858199   297971:
 38fea7d3a1d5f2c2189511f7870839d703030116   297967:
 5856f9cbe85b340fad4746c47b0db8687f8be3c4 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/cifs/cifsglob.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 899ee21a86b4..61133daf4d1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e94f7ba124bfbd3898f620c46891ebcfb9cf20d0
+refs/heads/master: 35ebb4155f2f9d5580679d368aea81a5933db481
diff --git a/trunk/fs/cifs/cifsglob.h b/trunk/fs/cifs/cifsglob.h
index 79eba5a15e80..d7e39b0de5b0 100644
--- a/trunk/fs/cifs/cifsglob.h
+++ b/trunk/fs/cifs/cifsglob.h
@@ -601,9 +601,11 @@ struct cifs_io_parms {
  * Take a reference on the file private data. Must be called with
  * cifs_file_list_lock held.
  */
-static inline void cifsFileInfo_get(struct cifsFileInfo *cifs_file)
+static inline
+struct cifsFileInfo *cifsFileInfo_get(struct cifsFileInfo *cifs_file)
 {
 	++cifs_file->count;
+	return cifs_file;
 }
 
 void cifsFileInfo_put(struct cifsFileInfo *cifs_file);