summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2008-05-03 17:29:50 -0500
committerEric Van Hensbergen <ericvh@opteron.9grid.us>2008-05-14 19:23:26 -0500
commitd0c447180bfcb1db8d59e6ddb10f0346bd7d29e9 (patch)
tree896887bfdb1cf7bf8dbb1212bb7526f5149cdad7
parent728fc4ef17748042d9c71144aa339ed9c68e8b01 (diff)
downloadop-kernel-dev-d0c447180bfcb1db8d59e6ddb10f0346bd7d29e9.zip
op-kernel-dev-d0c447180bfcb1db8d59e6ddb10f0346bd7d29e9.tar.gz
9p: fix flags length in net
Some files in the net/9p directory uses "int" for flags. This can cause hard to find bugs on some architectures. This patch converts the flags to use "long" instead. This bug was discovered by doing an allyesconfig make on the -rt kernel where checks are done to ensure all flags are of size sizeof(long). Signed-off-by: Steven Rostedt <srostedt@redhat.com> Acked-by: Eric Van Hensbergen <ericvh@gmail.com>
-rw-r--r--net/9p/trans_virtio.c2
-rw-r--r--net/9p/util.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index d23ed60..42adc05 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -201,7 +201,7 @@ static void p9_virtio_close(struct p9_trans *trans)
{
struct virtio_chan *chan = trans->priv;
int count;
- unsigned int flags;
+ unsigned long flags;
spin_lock_irqsave(&chan->lock, flags);
p9_idpool_destroy(chan->tagpool);
diff --git a/net/9p/util.c b/net/9p/util.c
index 4d56460..958fc58 100644
--- a/net/9p/util.c
+++ b/net/9p/util.c
@@ -88,7 +88,7 @@ int p9_idpool_get(struct p9_idpool *p)
{
int i = 0;
int error;
- unsigned int flags;
+ unsigned long flags;
retry:
if (idr_pre_get(&p->pool, GFP_KERNEL) == 0)
@@ -120,7 +120,7 @@ EXPORT_SYMBOL(p9_idpool_get);
void p9_idpool_put(int id, struct p9_idpool *p)
{
- unsigned int flags;
+ unsigned long flags;
spin_lock_irqsave(&p->lock, flags);
idr_remove(&p->pool, id);
spin_unlock_irqrestore(&p->lock, flags);
OpenPOWER on IntegriCloud