aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/super.c
diff options
context:
space:
mode:
authorCheng Renquan <crquan@gmail.com>2010-03-26 05:40:33 -0400
committerSage Weil <sage@newdream.net>2010-05-17 18:25:17 -0400
commit640ef79d27c81b7a3265a344ec1d25644dd463ad (patch)
treef5632a0b2a2f6cef7c6f3a513bbb6020d6ac694a /fs/ceph/super.c
parent2d06eeb877581a7f53209af1582c5f66c799f0bd (diff)
ceph: use ceph_sb_to_client instead of ceph_client
ceph_sb_to_client and ceph_client are really identical, we need to dump one; while function ceph_client is confusing with "struct ceph_client", ceph_sb_to_client's definition is more clear; so we'd better switch all call to ceph_sb_to_client. -static inline struct ceph_client *ceph_client(struct super_block *sb) -{ - return sb->s_fs_info; -} Signed-off-by: Cheng Renquan <crquan@gmail.com> Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/super.c')
-rw-r--r--fs/ceph/super.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 110857ba9269..93ad169a6ae1 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -107,8 +107,8 @@ static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf)
107static int ceph_syncfs(struct super_block *sb, int wait) 107static int ceph_syncfs(struct super_block *sb, int wait)
108{ 108{
109 dout("sync_fs %d\n", wait); 109 dout("sync_fs %d\n", wait);
110 ceph_osdc_sync(&ceph_client(sb)->osdc); 110 ceph_osdc_sync(&ceph_sb_to_client(sb)->osdc);
111 ceph_mdsc_sync(&ceph_client(sb)->mdsc); 111 ceph_mdsc_sync(&ceph_sb_to_client(sb)->mdsc);
112 dout("sync_fs %d done\n", wait); 112 dout("sync_fs %d done\n", wait);
113 return 0; 113 return 0;
114} 114}
@@ -932,9 +932,9 @@ static int ceph_get_sb(struct file_system_type *fs_type,
932 goto out; 932 goto out;
933 } 933 }
934 934
935 if (ceph_client(sb) != client) { 935 if (ceph_sb_to_client(sb) != client) {
936 ceph_destroy_client(client); 936 ceph_destroy_client(client);
937 client = ceph_client(sb); 937 client = ceph_sb_to_client(sb);
938 dout("get_sb got existing client %p\n", client); 938 dout("get_sb got existing client %p\n", client);
939 } else { 939 } else {
940 dout("get_sb using new client %p\n", client); 940 dout("get_sb using new client %p\n", client);