diff options
author | Sage Weil <sage@newdream.net> | 2009-12-23 12:30:21 -0500 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2009-12-23 12:30:21 -0500 |
commit | 04a419f908b5291ff7e8ffd7aa351fa0ac0c08af (patch) | |
tree | 2e634bdca766c27b88280ab5c1ce067f47ffe536 /fs/ceph/dir.c | |
parent | 6df058c025ce343052c5516b1d8a9a7e73cddd64 (diff) |
ceph: add feature bits to connection handshake (protocol change)
Define supported and required feature set. Fail connection if the server
requires features we do not support (TAG_FEATURES), or if the server does
not support features we require.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/dir.c')
-rw-r--r-- | fs/ceph/dir.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index fde839c61236..5107384ee029 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c | |||
@@ -1135,9 +1135,9 @@ void ceph_dentry_lru_add(struct dentry *dn) | |||
1135 | { | 1135 | { |
1136 | struct ceph_dentry_info *di = ceph_dentry(dn); | 1136 | struct ceph_dentry_info *di = ceph_dentry(dn); |
1137 | struct ceph_mds_client *mdsc; | 1137 | struct ceph_mds_client *mdsc; |
1138 | dout("dentry_lru_add %p %p\t%.*s\n", | ||
1139 | di, dn, dn->d_name.len, dn->d_name.name); | ||
1140 | 1138 | ||
1139 | dout("dentry_lru_add %p %p '%.*s'\n", di, dn, | ||
1140 | dn->d_name.len, dn->d_name.name); | ||
1141 | if (di) { | 1141 | if (di) { |
1142 | mdsc = &ceph_client(dn->d_sb)->mdsc; | 1142 | mdsc = &ceph_client(dn->d_sb)->mdsc; |
1143 | spin_lock(&mdsc->dentry_lru_lock); | 1143 | spin_lock(&mdsc->dentry_lru_lock); |
@@ -1151,9 +1151,9 @@ void ceph_dentry_lru_touch(struct dentry *dn) | |||
1151 | { | 1151 | { |
1152 | struct ceph_dentry_info *di = ceph_dentry(dn); | 1152 | struct ceph_dentry_info *di = ceph_dentry(dn); |
1153 | struct ceph_mds_client *mdsc; | 1153 | struct ceph_mds_client *mdsc; |
1154 | dout("dentry_lru_touch %p %p\t%.*s\n", | ||
1155 | di, dn, dn->d_name.len, dn->d_name.name); | ||
1156 | 1154 | ||
1155 | dout("dentry_lru_touch %p %p '%.*s'\n", di, dn, | ||
1156 | dn->d_name.len, dn->d_name.name); | ||
1157 | if (di) { | 1157 | if (di) { |
1158 | mdsc = &ceph_client(dn->d_sb)->mdsc; | 1158 | mdsc = &ceph_client(dn->d_sb)->mdsc; |
1159 | spin_lock(&mdsc->dentry_lru_lock); | 1159 | spin_lock(&mdsc->dentry_lru_lock); |
@@ -1167,8 +1167,8 @@ void ceph_dentry_lru_del(struct dentry *dn) | |||
1167 | struct ceph_dentry_info *di = ceph_dentry(dn); | 1167 | struct ceph_dentry_info *di = ceph_dentry(dn); |
1168 | struct ceph_mds_client *mdsc; | 1168 | struct ceph_mds_client *mdsc; |
1169 | 1169 | ||
1170 | dout("dentry_lru_del %p %p\t%.*s\n", | 1170 | dout("dentry_lru_del %p %p '%.*s'\n", di, dn, |
1171 | di, dn, dn->d_name.len, dn->d_name.name); | 1171 | dn->d_name.len, dn->d_name.name); |
1172 | if (di) { | 1172 | if (di) { |
1173 | mdsc = &ceph_client(dn->d_sb)->mdsc; | 1173 | mdsc = &ceph_client(dn->d_sb)->mdsc; |
1174 | spin_lock(&mdsc->dentry_lru_lock); | 1174 | spin_lock(&mdsc->dentry_lru_lock); |