6 files changed, 15 insertions, 15 deletions

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 6a94b094a904..78c8e761b321 100644
--- 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 d55315a46ece..a7febb4bd400 100644
--- 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 86d07d436cdf..7a34a3234266 100644
--- 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 6c1ec6c60639..6af6a3cea967 100644
--- 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 b041cb8ae383..abfaecde0e3d 100644
--- 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 cd9a94a6b5bb..5c4eae3b69fb 100644
--- 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);