Skip to contentSkip to conversation

ceph: clean up and optimize ceph_check_delayed_caps

PATCH In review Jeff Layton 2 participants 2 messages Jul 1, 2020 – Jul 2, 2020 Ceph client

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ceph: clean up and optimize ceph_check_delayed_caps

Make this loop look a bit more sane. Also optimize away the spinlock release/reacquire if we can't get an inode reference.

---
 fs/ceph/caps.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
fs/ceph/caps.c +4 -6
index 5f4894063a73..55ccccf77cea 100644
@@ -4189,10 +4189,8 @@ void ceph_check_delayed_caps(struct ceph_mds_client *mdsc)
 	struct ceph_inode_info *ci;
 
 	dout("check_delayed_caps\n");
-	while (1) {
-		spin_lock(&mdsc->cap_delay_lock);
-		if (list_empty(&mdsc->cap_delay_list))
-			break;
+	spin_lock(&mdsc->cap_delay_lock);
+	while (!list_empty(&mdsc->cap_delay_list)) {
 		ci = list_first_entry(&mdsc->cap_delay_list,
 				      struct ceph_inode_info,
 				      i_cap_delay_list);
@@ -4202,13 +4200,13 @@ void ceph_check_delayed_caps(struct ceph_mds_client *mdsc)
 		list_del_init(&ci->i_cap_delay_list);
 
 		inode = igrab(&ci->vfs_inode);
-		spin_unlock(&mdsc->cap_delay_lock);
-
 		if (inode) {
+			spin_unlock(&mdsc->cap_delay_lock);
 			dout("check_delayed_caps on %p\n", inode);
 			ceph_check_caps(ci, 0, NULL);
 			/* avoid calling iput_final() in tick thread */
 			ceph_async_iput(inode);
+			spin_lock(&mdsc->cap_delay_lock);
 		}
 	}
 	spin_unlock(&mdsc->cap_delay_lock);
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 31 lines · Jeff Layton

Make this loop look a bit more sane. Also optimize away the spinlock release/reacquire if we can't get an inode reference.

---
  fs/ceph/caps.c | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
fs/ceph/caps.c +2 -6
index 5f4894063a73..55ccccf77cea 100644
@@ -4189,10 +4189,8 @@ void ceph_check_delayed_caps(struct ceph_mds_client *mdsc)
  	struct ceph_inode_info *ci;
 
  	dout("check_delayed_caps\n");
-	while (1) {
-		spin_lock(&mdsc->cap_delay_lock);
-		if (list_empty(&mdsc->cap_delay_list))
-			break;
+	spin_lock(&mdsc->cap_delay_lock);
+	while (!list_empty(&mdsc->cap_delay_list)) {
  		ci = list_first_entry(&mdsc->cap_delay_list,
  				      struct ceph_inode_info,
  				      i_cap_delay_list);
@@ -4202,13 +4200,13 @@ void ceph_check_delayed_caps(struct ceph_mds_client *mdsc)
  		list_del_init(&ci->i_cap_delay_list);
 
  		inode = igrab(&ci->vfs_inode);
-		spin_unlock(&mdsc->cap_delay_lock);
-

fs/ceph/caps.c void ceph_check_delayed_caps(struct ceph_mds_client *mdsc) · line 4212

Quoted 10 lines
fs/ceph/caps.c +2 -0
  		if (inode) {
+			spin_unlock(&mdsc->cap_delay_lock);
  			dout("check_delayed_caps on %p\n", inode);
  			ceph_check_caps(ci, 0, NULL);
  			/* avoid calling iput_final() in tick thread */
  			ceph_async_iput(inode);
+			spin_lock(&mdsc->cap_delay_lock);
  		}
  	}
  	spin_unlock(&mdsc->cap_delay_lock);