Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / fs / gfs2 / quota.c

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 64b29f7..c8b148b 100644 (file)
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1360,13 +1360,8 @@ void gfs2_quota_cleanup(struct gfs2_sbd *sdp)
 
        gfs2_assert_warn(sdp, !atomic_read(&sdp->sd_quota_count));
 
-       if (sdp->sd_quota_bitmap) {
-               if (is_vmalloc_addr(sdp->sd_quota_bitmap))
-                       vfree(sdp->sd_quota_bitmap);
-               else
-                       kfree(sdp->sd_quota_bitmap);
-               sdp->sd_quota_bitmap = NULL;
-       }
+       kvfree(sdp->sd_quota_bitmap);
+       sdp->sd_quota_bitmap = NULL;
 }
 
 static void quotad_error(struct gfs2_sbd *sdp, const char *msg, int error)