Commit 2d9a4bbf authored by Abhijith Das's avatar Abhijith Das Committed by Steven Whitehouse
Browse files

[GFS2] Fix quota do_list operation hang 



This is the filesystem part of the patches to fix this bz. There are
additional userland patches (gfs2_quota, libgfs2) for the complete
solution. This patch adds a new field qu_ll_next to the gfs2_quota
structure. This field allows us to create linked lists of quotas in the
ondisk quota inode. Instead of scanning through the entire sparse quota
file for valid quotas, we can now simply walk through the user and group
quota linked lists to perform the do_list operation.

Signed-off-by: default avatarAbhijith Das <adas@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 34eaae39

fs/gfs2/quota.c

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct gfs2_quota_host { 
	u64 qu_limit;

	u64 qu_warn;

	s64 qu_value;

	u32 qu_ll_next;

};



struct gfs2_quota_change_host {
@@ -580,6 +581,7 @@ static void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf) 
	qu->qu_limit = be64_to_cpu(str->qu_limit);

	qu->qu_warn = be64_to_cpu(str->qu_warn);

	qu->qu_value = be64_to_cpu(str->qu_value);

	qu->qu_ll_next = be32_to_cpu(str->qu_ll_next);

}



static void gfs2_quota_out(const struct gfs2_quota_host *qu, void *buf)
@@ -589,6 +591,7 @@ static void gfs2_quota_out(const struct gfs2_quota_host *qu, void *buf) 
	str->qu_limit = cpu_to_be64(qu->qu_limit);

	str->qu_warn = cpu_to_be64(qu->qu_warn);

	str->qu_value = cpu_to_be64(qu->qu_value);

	str->qu_ll_next = cpu_to_be32(qu->qu_ll_next);

	memset(&str->qu_reserved, 0, sizeof(str->qu_reserved));

}

include/linux/gfs2_ondisk.h

+29 −1
Original line number Diff line number Diff line
@@ -169,6 +169,33 @@ struct gfs2_rgrp { 
	__u8 rg_reserved[80]; /* Several fields from gfs1 now reserved */

};



/*

 * quota linked list: user quotas and group quotas form two separate 

 * singly linked lists. ll_next stores uids or gids of next quotas in the 

 * linked list.



Given the uid/gid, how to calculate the quota file offsets for the corresponding

gfs2_quota structures on disk:



for user quotas, given uid,

offset = uid * sizeof(struct gfs2_quota);



for group quotas, given gid,

offset = (gid * sizeof(struct gfs2_quota)) + sizeof(struct gfs2_quota);





  uid:0   gid:0       uid:12   gid:12      uid:17   gid:17     uid:5142 gid:5142

+-------+-------+    +-------+-------+    +-------+- - - -+    +- - - -+-------+

| valid | valid | :: | valid | valid | :: | valid | inval | :: | inval | valid |

+-------+-------+    +-------+-------+    +-------+- - - -+    +- - - -+-------+

next:12   next:12    next:17 next:5142    next:NULL                    next:NULL

    |       |            |       |            |<-- user quota list         |

     \______|___________/ \______|___________/         group quota list -->|

            |                    |                                         |

             \__________________/ \_______________________________________/



*/



/*

 * quota structure

 */
@@ -177,7 +204,8 @@ struct gfs2_quota { 
	__be64 qu_limit;

	__be64 qu_warn;

	__be64 qu_value;

	__u8 qu_reserved[64];

	__be32 qu_ll_next; /* location of next quota in list */

	__u8 qu_reserved[60];

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE