diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2013-10-04 12:29:34 +0100 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2013-10-04 12:29:34 +0100 |
commit | e46c772dbafc2059b0c7ee87c6a7232baadaf6c7 (patch) | |
tree | 43e33f6a25ba196b9391e5f03e137a46455a0807 /fs/gfs2/quota.c | |
parent | aabd7c72f52145fcf13f9251770b0b0246b5e406 (diff) | |
download | blackbird-obmc-linux-e46c772dbafc2059b0c7ee87c6a7232baadaf6c7.tar.gz blackbird-obmc-linux-e46c772dbafc2059b0c7ee87c6a7232baadaf6c7.zip |
GFS2: Protect quota sync generation
Now that gfs2_quota_sync can be potentially called from multiple
threads, we should protect this bit of code, and the sync generation
number in particular in order to ensure that there are no races
when syncing quotas.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: Abhijith Das <adas@redhat.com>
Diffstat (limited to 'fs/gfs2/quota.c')
-rw-r--r-- | fs/gfs2/quota.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index cfb4cdeddacb..4a9726aa191f 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -1132,12 +1132,13 @@ int gfs2_quota_sync(struct super_block *sb, int type) unsigned int x; int error = 0; - sdp->sd_quota_sync_gen++; - qda = kcalloc(max_qd, sizeof(struct gfs2_quota_data *), GFP_KERNEL); if (!qda) return -ENOMEM; + mutex_lock(&sdp->sd_quota_sync_mutex); + sdp->sd_quota_sync_gen++; + do { num_qd = 0; @@ -1162,6 +1163,7 @@ int gfs2_quota_sync(struct super_block *sb, int type) } } while (!error && num_qd == max_qd); + mutex_unlock(&sdp->sd_quota_sync_mutex); kfree(qda); return error; |