aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/incore.h
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-04-07 11:17:32 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-04-07 11:17:32 -0400
commitb09e593d799560f1a0782c20ac5900058390a26f (patch)
tree20f04bd2c8ba9c09ac80a7bb1400d341c4fd7e21 /fs/gfs2/incore.h
parent55eccc6d00cea224bf634d44e9871cfe83200ff2 (diff)
[GFS2] Fix a ref count bug and other clean ups
This fixes a ref count bug that sometimes showed up a umount time (causing it to hang) but it otherwise mostly harmless. At the same time there are some clean ups including making the log operations structures const, moving a memory allocation so that its not done in the fast path of checking to see if there is an outstanding transaction related to a particular glock. Removes the sd_log_wrap varaible which was updated, but never actually used anywhere. Updates the gfs2 ioctl() to run without the kernel lock (which it never needed anyway). Removes the "invalidate inodes" loop from GFS2's put_super routine. This is done in kill super anyway so we don't need to do it here. The loop was also bogus in that if there are any inodes "stuck" at this point its a bug and we need to know about it rather than hide it by hanging forever. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/incore.h')
-rw-r--r--fs/gfs2/incore.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 423cfa72b4c7..dfed83b37ab7 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -62,12 +62,12 @@ struct gfs2_log_operations {
62 struct gfs2_log_descriptor *ld, __be64 *ptr, 62 struct gfs2_log_descriptor *ld, __be64 *ptr,
63 int pass); 63 int pass);
64 void (*lo_after_scan) (struct gfs2_jdesc *jd, int error, int pass); 64 void (*lo_after_scan) (struct gfs2_jdesc *jd, int error, int pass);
65 char *lo_name; 65 const char *lo_name;
66}; 66};
67 67
68struct gfs2_log_element { 68struct gfs2_log_element {
69 struct list_head le_list; 69 struct list_head le_list;
70 struct gfs2_log_operations *le_ops; 70 const struct gfs2_log_operations *le_ops;
71}; 71};
72 72
73struct gfs2_bitmap { 73struct gfs2_bitmap {
@@ -618,6 +618,7 @@ struct gfs2_sbd {
618 unsigned int sd_log_num_rg; 618 unsigned int sd_log_num_rg;
619 unsigned int sd_log_num_databuf; 619 unsigned int sd_log_num_databuf;
620 unsigned int sd_log_num_jdata; 620 unsigned int sd_log_num_jdata;
621 unsigned int sd_log_num_hdrs;
621 622
622 struct list_head sd_log_le_gl; 623 struct list_head sd_log_le_gl;
623 struct list_head sd_log_le_buf; 624 struct list_head sd_log_le_buf;
@@ -631,7 +632,6 @@ struct gfs2_sbd {
631 uint64_t sd_log_sequence; 632 uint64_t sd_log_sequence;
632 unsigned int sd_log_head; 633 unsigned int sd_log_head;
633 unsigned int sd_log_tail; 634 unsigned int sd_log_tail;
634 uint64_t sd_log_wraps;
635 int sd_log_idle; 635 int sd_log_idle;
636 636
637 unsigned long sd_log_flush_time; 637 unsigned long sd_log_flush_time;