On Wed, Aug 14, 2013 at 04:27:56PM +0800, Jeff Liu wrote: > From: Jie Liu <jeff.liu@xxxxxxxxxx> > > 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 > > Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx> > --- > fs/xfs/xfs_trans_ail.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c > index 0eda725..e91d160 100644 > --- a/fs/xfs/xfs_trans_ail.c > +++ b/fs/xfs/xfs_trans_ail.c > @@ -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. -- Dave Chinner david@xxxxxxxxxxxxx _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs