orangefs: Do not unref if there is no bufmap.
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c
index cf3ffb5..888aa281 100644
--- a/fs/orangefs/orangefs-bufmap.c
+++ b/fs/orangefs/orangefs-bufmap.c
@@ -82,21 +82,32 @@
}
}
+/*
+ * XXX: Can the size and shift change while the caller gives up the
+ * XXX: lock between calling this and doing something useful?
+ */
+
int orangefs_bufmap_size_query(void)
{
- struct orangefs_bufmap *bufmap = orangefs_bufmap_ref();
- int size = bufmap ? bufmap->desc_size : 0;
-
- orangefs_bufmap_unref(bufmap);
+ struct orangefs_bufmap *bufmap;
+ int size = 0;
+ bufmap = orangefs_bufmap_ref();
+ if (bufmap) {
+ size = bufmap->desc_size;
+ orangefs_bufmap_unref(bufmap);
+ }
return size;
}
int orangefs_bufmap_shift_query(void)
{
- struct orangefs_bufmap *bufmap = orangefs_bufmap_ref();
- int shift = bufmap ? bufmap->desc_shift : 0;
-
- orangefs_bufmap_unref(bufmap);
+ struct orangefs_bufmap *bufmap;
+ int shift = 0;
+ bufmap = orangefs_bufmap_ref();
+ if (bufmap) {
+ shift = bufmap->desc_shift;
+ orangefs_bufmap_unref(bufmap);
+ }
return shift;
}