Skip to contentSkip to conversation

xfs: Simplify xfs_ail_min() with list_first_entry_or_null()

PATCH Superseded Jeff Liu 2 participants 3 messages Aug 14, 2013 – Aug 15, 2013 XFS filesystem

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jeff Liu

author
#0 lore raw

PATCH 1/1 xfs: Simplify xfs_ail_min() with list_first_entry_or_null()

From: Jie Liu <[email protected]>

At xfs_ail_min(), we do check if the AIL list is empty or not before returning the first item in it with list_empty() and list_first_entry().

This can be simplified a bit with a new list operation routine that is the list_first_entry_or_null() which has been introduced by:

commit 6d7581e62f8be462440d7b22c6361f7c9fa4902b
list: introduce list_first_entry_or_null

---
 fs/xfs/xfs_trans_ail.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/xfs/xfs_trans_ail.c +1 -4
index 0eda725..e91d160 100644
@@ -68,10 +68,7 @@ xfs_log_item_t *
 xfs_ail_min(
 	struct xfs_ail  *ailp)
 {
-	if (list_empty(&ailp->xa_ail))
-		return NULL;
-
-	return list_first_entry(&ailp->xa_ail, xfs_log_item_t, li_ail);
+	return list_first_entry_or_null(&ailp->xa_ail, xfs_log_item_t, li_ail);
 }
 
  /*
Signature · 6 lines
1.7.9.5

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#1 lore raw
Quoted 21 lines · Jeff Liu

From: Jie Liu <[email protected]>

At xfs_ail_min(), we do check if the AIL list is empty or not before returning the first item in it with list_empty() and list_first_entry().

This can be simplified a bit with a new list operation routine that is the list_first_entry_or_null() which has been introduced by:

commit 6d7581e62f8be462440d7b22c6361f7c9fa4902b
list: introduce list_first_entry_or_null

---
 fs/xfs/xfs_trans_ail.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/xfs/xfs_trans_ail.c +0 -0
index 0eda725..e91d160 100644

fs/xfs/xfs_trans_ail.c xfs_log_item_t * · line 72

Quoted 9 lines
fs/xfs/xfs_trans_ail.c +1 -4
@@ -68,10 +68,7 @@ xfs_log_item_t *
 xfs_ail_min(
 	struct xfs_ail  *ailp)
 {
-	if (list_empty(&ailp->xa_ail))
-		return NULL;
-
-	return list_first_entry(&ailp->xa_ail, xfs_log_item_t, li_ail);
+	return list_first_entry_or_null(&ailp->xa_ail, xfs_log_item_t, li_ail);
 }

At this point, it can become a static inline function in xfs_trans_priv.h. And while you are touching this, remove the typedef...

Cheers,

Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
author
#2 lore raw
Quoted 27 lines · Dave Chinner
Quoted 26 lines · Jeff Liu

From: Jie Liu <[email protected]>

At xfs_ail_min(), we do check if the AIL list is empty or not before returning the first item in it with list_empty() and list_first_entry().

This can be simplified a bit with a new list operation routine that is the list_first_entry_or_null() which has been introduced by:

commit 6d7581e62f8be462440d7b22c6361f7c9fa4902b
list: introduce list_first_entry_or_null

---
 fs/xfs/xfs_trans_ail.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/xfs/xfs_trans_ail.c +0 -2
index 0eda725..e91d160 100644
@@ -68,10 +68,7 @@ xfs_log_item_t *
 xfs_ail_min(
 	struct xfs_ail  *ailp)
 {
-	if (list_empty(&ailp->xa_ail))
-		return NULL;
Quoted 8 lines

fs/xfs/xfs_trans_ail.c xfs_log_item_t * · line 72

Quoted 4 lines
fs/xfs/xfs_trans_ail.c +1 -2
-
-	return list_first_entry(&ailp->xa_ail, xfs_log_item_t, li_ail);
+	return list_first_entry_or_null(&ailp->xa_ail, xfs_log_item_t, li_ail);
 }

At this point, it can become a static inline function in xfs_trans_priv.h. And while you are touching this, remove the typedef...

Ok, I'll take care of that.

Thanks,
-Jeff

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs