libceph: a major OSD client update

This is a major sync up, up to ~Jewel.  The highlights are:

- per-session request trees (vs a global per-client tree)
- per-session locking (vs a global per-client rwlock)
- homeless OSD session
- no ad-hoc global per-client lists
- support for pool quotas
- foundation for watch/notify v2 support
- foundation for map check (pool deletion detection) support

The switchover is incomplete: lingering requests can be setup and
teared down but aren't ever reestablished.  This functionality is
restored with the introduction of the new lingering infrastructure
(ceph_osd_linger_request, linger_work, etc) in a later commit.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 9410abdef3ce..5afabc4bf4c7 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -75,7 +75,7 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
         char buf[128];
 
         dout("ceph_vxattrcb_layout %p\n", &ci->vfs_inode);
-        down_read(&osdc->map_sem);
+        down_read(&osdc->lock);
         pool_name = ceph_pg_pool_name_by_id(osdc->osdmap, pool);
         if (pool_name) {
                 size_t len = strlen(pool_name);
@@ -107,7 +107,7 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
                                 ret = -ERANGE;
                 }
         }
-        up_read(&osdc->map_sem);
+        up_read(&osdc->lock);
         return ret;
 }
 
@@ -141,13 +141,13 @@ static size_t ceph_vxattrcb_layout_pool(struct ceph_inode_info *ci,
         s64 pool = ceph_file_layout_pg_pool(ci->i_layout);
         const char *pool_name;
 
-        down_read(&osdc->map_sem);
+        down_read(&osdc->lock);
         pool_name = ceph_pg_pool_name_by_id(osdc->osdmap, pool);
         if (pool_name)
                 ret = snprintf(val, size, "%s", pool_name);
         else
                 ret = snprintf(val, size, "%lld", (unsigned long long)pool);
-        up_read(&osdc->map_sem);
+        up_read(&osdc->lock);
         return ret;
 }