Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[~andy/linux] / fs / gfs2 / incore.h

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index e2601ba38ef56899869ff69e101f957f18313709..156e42ec84ea488c9c223400284c9040b5c86f69 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -392,7 +392,6 @@ struct gfs2_revoke_replay {
 };
 
 enum {
-       QDF_USER                = 0,
        QDF_CHANGE              = 1,
        QDF_LOCKED              = 2,
        QDF_REFRESH             = 3,
@@ -404,7 +403,7 @@ struct gfs2_quota_data {
 
        atomic_t qd_count;
 
-       u32 qd_id;
+       struct kqid qd_id;
        unsigned long qd_flags;         /* QDF_... */
 
        s64 qd_change;