aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilosz Tanski <milosz@adfin.com>2013-09-06 11:13:18 -0400
committerMilosz Tanski <milosz@adfin.com>2013-09-06 12:50:12 -0400
commit971f0bdeaabac4fcc335dace2f98e79157db4302 (patch)
tree0db806be12d433bfa82cb670cadf18549e8f2e2b
parente81568eb1819af1391ac27ab28ac851410315a9f (diff)
ceph: trivial buildbot warnings fix
The linux-next build bot found a three of warnings, this addresses all of them. * non-ANSI function declaration of function 'ceph_fscache_register' and 'ceph_fscache_unregister' * symbol 'ceph_cache_netfs' was not declared, now it's extern in the header. * warning: "pr_fmt" redefined Signed-off-by: Milosz Tanski <milosz@adfin.com>
-rw-r--r--fs/ceph/cache.c6
-rw-r--r--fs/ceph/cache.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/ceph/cache.c b/fs/ceph/cache.c
index d3b88c7518d0..6bfe65e0b038 100644
--- a/fs/ceph/cache.c
+++ b/fs/ceph/cache.c
@@ -21,8 +21,6 @@
21 * 21 *
22 */ 22 */
23 23
24#include <linux/fscache.h>
25
26#include "super.h" 24#include "super.h"
27#include "cache.h" 25#include "cache.h"
28 26
@@ -56,12 +54,12 @@ static const struct fscache_cookie_def ceph_fscache_fsid_object_def = {
56 .get_key = ceph_fscache_session_get_key, 54 .get_key = ceph_fscache_session_get_key,
57}; 55};
58 56
59int ceph_fscache_register() 57int ceph_fscache_register(void)
60{ 58{
61 return fscache_register_netfs(&ceph_cache_netfs); 59 return fscache_register_netfs(&ceph_cache_netfs);
62} 60}
63 61
64void ceph_fscache_unregister() 62void ceph_fscache_unregister(void)
65{ 63{
66 fscache_unregister_netfs(&ceph_cache_netfs); 64 fscache_unregister_netfs(&ceph_cache_netfs);
67} 65}
diff --git a/fs/ceph/cache.h b/fs/ceph/cache.h
index bf4869547291..ba949408a336 100644
--- a/fs/ceph/cache.h
+++ b/fs/ceph/cache.h
@@ -26,6 +26,8 @@
26 26
27#ifdef CONFIG_CEPH_FSCACHE 27#ifdef CONFIG_CEPH_FSCACHE
28 28
29extern struct fscache_netfs ceph_cache_netfs;
30
29int ceph_fscache_register(void); 31int ceph_fscache_register(void);
30void ceph_fscache_unregister(void); 32void ceph_fscache_unregister(void);
31 33