summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/incore.h
diff options
context:
space:
mode:
authorDavid Woodhouse2006-06-20 14:44:27 +0200
committerDavid Woodhouse2006-06-20 14:44:27 +0200
commit695165dfba5204791bc4ae8911ed8b6326ce6d91 (patch)
tree58729438822548860fc726191e3b1b149dad72a9 /fs/gfs2/incore.h
parentMerge branch 'master' (diff)
downloadkernel-qcow2-linux-695165dfba5204791bc4ae8911ed8b6326ce6d91.tar.gz
kernel-qcow2-linux-695165dfba5204791bc4ae8911ed8b6326ce6d91.tar.xz
kernel-qcow2-linux-695165dfba5204791bc4ae8911ed8b6326ce6d91.zip
[GFS2] Fix use of bitops on unsigned int (struct gfs2_holder->gh_iflags)
fs/gfs2/glock.c: In function ‘gfs2_holder_get’: fs/gfs2/glock.c:439: warning: passing argument 2 of ‘set_bit’ from incompatible pointer type fs/gfs2/glock.c: In function ‘rq_promote’: fs/gfs2/glock.c:512: warning: passing argument 2 of ‘set_bit’ from incompatible pointer type fs/gfs2/glock.c:526: warning: passing argument 2 of ‘set_bit’ from incompatible pointer type ... Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/gfs2/incore.h')
-rw-r--r--fs/gfs2/incore.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 9a67a5954126..034a855a14bb 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -157,7 +157,7 @@ struct gfs2_holder {
unsigned gh_flags;
int gh_error;
- unsigned gh_iflags;
+ unsigned long gh_iflags;
struct completion gh_wait;
unsigned long gh_ip;
};