>From b62f963e1fdf838fed91faec21228d421a834f2d Mon Sep 17 00:00:00 2001
From: Al Viro <[EMAIL PROTECTED]>
Date: Fri, 13 Oct 2006 23:46:46 -0400
Subject: [PATCH] [GFS2] split and annotate gfs2_quota_change
Signed-off-by: Al Viro <[EMAIL PROTECTED]>
Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
---
fs/gfs2/ondisk.c | 2 +-
fs/gfs2/quota.c | 2 +-
include/linux/gfs2_ondisk.h | 8 +++++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
index 84c59b1..2d1682d 100644
--- a/fs/gfs2/ondisk.c
+++ b/fs/gfs2/ondisk.c
@@ -297,7 +297,7 @@ void gfs2_statfs_change_out(const struct
str->sc_dinodes = cpu_to_be64(sc->sc_dinodes);
}
-void gfs2_quota_change_in(struct gfs2_quota_change *qc, const void *buf)
+void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void *buf)
{
const struct gfs2_quota_change *str = buf;
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index e3f5b8d..009d86c 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1103,7 +1103,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp
for (y = 0; y < sdp->sd_qc_per_block && slot <
sdp->sd_quota_slots;
y++, slot++) {
- struct gfs2_quota_change qc;
+ struct gfs2_quota_change_host qc;
struct gfs2_quota_data *qd;
gfs2_quota_change_in(&qc, bh->b_data +
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index 3ce3a47..10a507d 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -517,6 +517,12 @@ struct gfs2_quota_change {
__be32 qc_id;
};
+struct gfs2_quota_change_host {
+ __u64 qc_change;
+ __u32 qc_flags; /* GFS2_QCF_... */
+ __u32 qc_id;
+};
+
#ifdef __KERNEL__
/* Translation functions */
@@ -537,7 +543,7 @@ extern void gfs2_inum_range_in(struct gf
extern void gfs2_inum_range_out(const struct gfs2_inum_range_host *ir, void
*buf);
extern void gfs2_statfs_change_in(struct gfs2_statfs_change_host *sc, const
void *buf);
extern void gfs2_statfs_change_out(const struct gfs2_statfs_change_host *sc,
void *buf);
-extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, const void
*buf);
+extern void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void
*buf);
/* Printing functions */
--
1.4.1
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
