mqueue doesn't need make_bad_inode()

[safe/jmp/linux-2.6] / fs / ceph / buffer.c

diff --git a/fs/ceph/buffer.c b/fs/ceph/buffer.c
index 847c5da..c67535d 100644 (file)
--- a/fs/ceph/buffer.c
+++ b/fs/ceph/buffer.c
@@ -1,24 +1,43 @@
 
 #include "ceph_debug.h"
+
+#include <linux/slab.h>
+
 #include "buffer.h"
+#include "decode.h"
 
-struct ceph_buffer *ceph_buffer_new(gfp_t gfp)
+struct ceph_buffer *ceph_buffer_new(size_t len, gfp_t gfp)
 {
        struct ceph_buffer *b;
 
        b = kmalloc(sizeof(*b), gfp);
        if (!b)
                return NULL;
+
+       b->vec.iov_base = kmalloc(len, gfp | __GFP_NOWARN);
+       if (b->vec.iov_base) {
+               b->is_vmalloc = false;
+       } else {
+               b->vec.iov_base = __vmalloc(len, gfp, PAGE_KERNEL);
+               if (!b->vec.iov_base) {
+                       kfree(b);
+                       return NULL;
+               }
+               b->is_vmalloc = true;
+       }
+
        kref_init(&b->kref);
-       b->vec.iov_base = NULL;
-       b->vec.iov_len = 0;
-       b->alloc_len = 0;
+       b->alloc_len = len;
+       b->vec.iov_len = len;
+       dout("buffer_new %p\n", b);
        return b;
 }
 
 void ceph_buffer_release(struct kref *kref)
 {
        struct ceph_buffer *b = container_of(kref, struct ceph_buffer, kref);
+
+       dout("buffer_release %p\n", b);
        if (b->vec.iov_base) {
                if (b->is_vmalloc)
                        vfree(b->vec.iov_base);
@@ -44,3 +63,19 @@ int ceph_buffer_alloc(struct ceph_buffer *b, int len, gfp_t gfp)
        return 0;
 }
 
+int ceph_decode_buffer(struct ceph_buffer **b, void **p, void *end)
+{
+       size_t len;
+
+       ceph_decode_need(p, end, sizeof(u32), bad);
+       len = ceph_decode_32(p);
+       dout("decode_buffer len %d\n", (int)len);
+       ceph_decode_need(p, end, len, bad);
+       *b = ceph_buffer_new(len, GFP_NOFS);
+       if (!*b)
+               return -ENOMEM;
+       ceph_decode_copy(p, (*b)->vec.iov_base, len);
+       return 0;
+bad:
+       return -EINVAL;
+}