gfs2: Rename sd_log_le_{revoke,ordered}

Rename sd_log_le_revoke to sd_log_revokes and sd_log_le_ordered to
sd_log_ordered: not sure what le stands for here, but it doesn't add
clarity, and if it stands for list entry, it's actually confusing as
those are both list heads but not list entries.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 6a94b094a90432b385c5c0cbd8eda1819fc1332d..78c8e761b321859199c6dc83df738cd329617df9 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -809,8 +809,8 @@ struct gfs2_sbd {
        atomic_t sd_log_pinned;
        unsigned int sd_log_num_revoke;
 
-       struct list_head sd_log_le_revoke;
-       struct list_head sd_log_le_ordered;
+       struct list_head sd_log_revokes;
+       struct list_head sd_log_ordered;
        spinlock_t sd_ordered_lock;
 
        atomic_t sd_log_thresh1;

diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index d55315a46ecee5aac4808d9ac21b15ed060d1706..a7febb4bd400465942249ec284867324cd2b73e6 100644 (file)
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -551,9 +551,9 @@ static void gfs2_ordered_write(struct gfs2_sbd *sdp)
        LIST_HEAD(written);
 
        spin_lock(&sdp->sd_ordered_lock);
-       list_sort(NULL, &sdp->sd_log_le_ordered, &ip_cmp);
-       while (!list_empty(&sdp->sd_log_le_ordered)) {
-               ip = list_entry(sdp->sd_log_le_ordered.next, struct gfs2_inode, i_ordered);
+       list_sort(NULL, &sdp->sd_log_ordered, &ip_cmp);
+       while (!list_empty(&sdp->sd_log_ordered)) {
+               ip = list_entry(sdp->sd_log_ordered.next, struct gfs2_inode, i_ordered);
                if (ip->i_inode.i_mapping->nrpages == 0) {
                        test_and_clear_bit(GIF_ORDERED, &ip->i_flags);
                        list_del(&ip->i_ordered);
@@ -564,7 +564,7 @@ static void gfs2_ordered_write(struct gfs2_sbd *sdp)
                filemap_fdatawrite(ip->i_inode.i_mapping);
                spin_lock(&sdp->sd_ordered_lock);
        }
-       list_splice(&written, &sdp->sd_log_le_ordered);
+       list_splice(&written, &sdp->sd_log_ordered);
        spin_unlock(&sdp->sd_ordered_lock);
 }
 
@@ -573,8 +573,8 @@ static void gfs2_ordered_wait(struct gfs2_sbd *sdp)
        struct gfs2_inode *ip;
 
        spin_lock(&sdp->sd_ordered_lock);
-       while (!list_empty(&sdp->sd_log_le_ordered)) {
-               ip = list_entry(sdp->sd_log_le_ordered.next, struct gfs2_inode, i_ordered);
+       while (!list_empty(&sdp->sd_log_ordered)) {
+               ip = list_entry(sdp->sd_log_ordered.next, struct gfs2_inode, i_ordered);
                list_del(&ip->i_ordered);
                WARN_ON(!test_and_clear_bit(GIF_ORDERED, &ip->i_flags));
                if (ip->i_inode.i_mapping->nrpages == 0)
@@ -611,7 +611,7 @@ void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
                gfs2_glock_hold(gl);
        }
        set_bit(GLF_LFLUSH, &gl->gl_flags);
-       list_add(&bd->bd_list, &sdp->sd_log_le_revoke);
+       list_add(&bd->bd_list, &sdp->sd_log_revokes);
 }
 
 void gfs2_write_revokes(struct gfs2_sbd *sdp)

diff --git a/fs/gfs2/log.h b/fs/gfs2/log.h
index 86d07d436cdf68154fe4d56896fb61c33f6ea36f..7a34a3234266a5225ae2b34522c80c9cd76d55f7 100644 (file)
--- a/fs/gfs2/log.h
+++ b/fs/gfs2/log.h
@@ -59,7 +59,7 @@ static inline void gfs2_ordered_add_inode(struct gfs2_inode *ip)
        if (!test_bit(GIF_ORDERED, &ip->i_flags)) {
                spin_lock(&sdp->sd_ordered_lock);
                if (!test_and_set_bit(GIF_ORDERED, &ip->i_flags))
-                       list_add(&ip->i_ordered, &sdp->sd_log_le_ordered);
+                       list_add(&ip->i_ordered, &sdp->sd_log_ordered);
                spin_unlock(&sdp->sd_ordered_lock);
        }
 }

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 6c1ec6c6063929ef746ab3a914331b4537b78921..6af6a3cea9679ab769c18d5a573b379fc605baaf 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -623,7 +623,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
 {
        struct gfs2_meta_header *mh;
        unsigned int offset;
-       struct list_head *head = &sdp->sd_log_le_revoke;
+       struct list_head *head = &sdp->sd_log_revokes;
        struct gfs2_bufdata *bd;
        struct page *page;
        unsigned int length;
@@ -661,7 +661,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
 
 static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
 {
-       struct list_head *head = &sdp->sd_log_le_revoke;
+       struct list_head *head = &sdp->sd_log_revokes;
        struct gfs2_bufdata *bd, *tmp;
 
        /*

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index b041cb8ae383d8fd3642f00e9f2985594573e044..abfaecde0e3dc8007768a5580674163d627e2d93 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -117,8 +117,8 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)
 
        spin_lock_init(&sdp->sd_log_lock);
        atomic_set(&sdp->sd_log_pinned, 0);
-       INIT_LIST_HEAD(&sdp->sd_log_le_revoke);
-       INIT_LIST_HEAD(&sdp->sd_log_le_ordered);
+       INIT_LIST_HEAD(&sdp->sd_log_revokes);
+       INIT_LIST_HEAD(&sdp->sd_log_ordered);
        spin_lock_init(&sdp->sd_ordered_lock);
 
        init_waitqueue_head(&sdp->sd_log_waitq);

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index cd9a94a6b5bb10ab589b56f4f9a854cf1cfeb4a5..5c4eae3b69fb0aca79c02cf7185ab047bf80d316 100644 (file)
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -260,7 +260,7 @@ void gfs2_trans_add_unrevoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len)
        unsigned int n = len;
 
        gfs2_log_lock(sdp);
-       list_for_each_entry_safe(bd, tmp, &sdp->sd_log_le_revoke, bd_list) {
+       list_for_each_entry_safe(bd, tmp, &sdp->sd_log_revokes, bd_list) {
                if ((bd->bd_blkno >= blkno) && (bd->bd_blkno < (blkno + len))) {
                        list_del_init(&bd->bd_list);
                        gfs2_assert_withdraw(sdp, sdp->sd_log_num_revoke);