ceph: simplify ceph_buffer interface

We never allocate the ceph_buffer and buffer separtely, so use a single
constructor.

Disallow put on NULL buffer; make the caller check.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/fs/ceph/buffer.c b/fs/ceph/buffer.c
index 847c5da9a0dbc4785ac1723b206ce76af7a6a14f..2576bd452cb8403eb201be578d4d7673b296a82d 100644 (file)
--- a/fs/ceph/buffer.c
+++ b/fs/ceph/buffer.c
@@ -2,23 +2,38 @@
 #include "ceph_debug.h"
 #include "buffer.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);

diff --git a/fs/ceph/buffer.h b/fs/ceph/buffer.h
index 3f541a13094fcecb4260c22def4c7f93b19ce55b..47b9514c5bbd7402a924938acbb3c3260147fffb 100644 (file)
--- a/fs/ceph/buffer.h
+++ b/fs/ceph/buffer.h
@@ -20,8 +20,8 @@ struct ceph_buffer {
        bool is_vmalloc;
 };
 
-struct ceph_buffer *ceph_buffer_new(gfp_t gfp);
-int ceph_buffer_alloc(struct ceph_buffer *b, int len, gfp_t gfp);
+extern struct ceph_buffer *ceph_buffer_new(size_t len, gfp_t gfp);
+extern void ceph_buffer_release(struct kref *kref);
 
 static inline struct ceph_buffer *ceph_buffer_get(struct ceph_buffer *b)
 {
@@ -29,23 +29,9 @@ static inline struct ceph_buffer *ceph_buffer_get(struct ceph_buffer *b)
        return b;
 }
 
-void ceph_buffer_release(struct kref *kref);
-
 static inline void ceph_buffer_put(struct ceph_buffer *b)
 {
-       if (b)
-               kref_put(&b->kref, ceph_buffer_release);
-}
-
-static inline struct ceph_buffer *ceph_buffer_new_alloc(int len, gfp_t gfp)
-{
-       struct ceph_buffer *b = ceph_buffer_new(gfp);
-
-       if (b && ceph_buffer_alloc(b, len, gfp) < 0) {
-               ceph_buffer_put(b);
-               b = NULL;
-       }
-       return b;
+       kref_put(&b->kref, ceph_buffer_release);
 }
 
 #endif

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 074ee42bd34442ab1dbb9b2ed5f8e6bf4207d4bd..db684686f48aac7765e6186fb836e8418421d225 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -383,8 +383,10 @@ void ceph_destroy_inode(struct inode *inode)
        }
 
        __ceph_destroy_xattrs(ci);
-       ceph_buffer_put(ci->i_xattrs.blob);
-       ceph_buffer_put(ci->i_xattrs.prealloc_blob);
+       if (ci->i_xattrs.blob)
+               ceph_buffer_put(ci->i_xattrs.blob);
+       if (ci->i_xattrs.prealloc_blob)
+               ceph_buffer_put(ci->i_xattrs.prealloc_blob);
 
        kmem_cache_free(ceph_inode_cachep, ci);
 }
@@ -526,7 +528,7 @@ static int fill_inode(struct inode *inode,
         * bytes are the xattr count).
         */
        if (iinfo->xattr_len > 4) {
-               xattr_blob = ceph_buffer_new_alloc(iinfo->xattr_len, GFP_NOFS);
+               xattr_blob = ceph_buffer_new(iinfo->xattr_len, GFP_NOFS);
                if (!xattr_blob)
                        pr_err("fill_inode ENOMEM xattr blob %d bytes\n",
                               iinfo->xattr_len);
@@ -715,7 +717,8 @@ no_change:
        err = 0;
 
 out:
-       ceph_buffer_put(xattr_blob);
+       if (xattr_blob)
+               ceph_buffer_put(xattr_blob);
        return err;
 }
 

diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c
index 45cec31fdf5e4f82e3aea1d77234f6db9594756f..bf762107b3d57642316a22837e1b725d17a4da31 100644 (file)
--- a/fs/ceph/messenger.c
+++ b/fs/ceph/messenger.c
@@ -2047,7 +2047,7 @@ int ceph_alloc_middle(struct ceph_connection *con, struct ceph_msg *msg)
        BUG_ON(!middle_len);
        BUG_ON(msg->middle);
 
-       msg->middle = ceph_buffer_new_alloc(middle_len, GFP_NOFS);
+       msg->middle = ceph_buffer_new(middle_len, GFP_NOFS);
        if (!msg->middle)
                return -ENOMEM;
        return 0;

diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 04769a3ab83264054c03ed8a837881e81b4b3fe3..37d6ce6456919db621d543e461504539cada8a6e 100644 (file)
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -482,7 +482,8 @@ void __ceph_build_xattrs_blob(struct ceph_inode_info *ci)
                ci->i_xattrs.prealloc_blob->vec.iov_len =
                        dest - ci->i_xattrs.prealloc_blob->vec.iov_base;
 
-               ceph_buffer_put(ci->i_xattrs.blob);
+               if (ci->i_xattrs.blob)
+                       ceph_buffer_put(ci->i_xattrs.blob);
                ci->i_xattrs.blob = ci->i_xattrs.prealloc_blob;
                ci->i_xattrs.prealloc_blob = NULL;
                ci->i_xattrs.dirty = false;
@@ -745,11 +746,12 @@ retry:
 
                spin_unlock(&inode->i_lock);
                dout(" preaallocating new blob size=%d\n", required_blob_size);
-               blob = ceph_buffer_new_alloc(required_blob_size, GFP_NOFS);
+               blob = ceph_buffer_new(required_blob_size, GFP_NOFS);
                if (!blob)
                        goto out;
                spin_lock(&inode->i_lock);
-               ceph_buffer_put(ci->i_xattrs.prealloc_blob);
+               if (ci->i_xattrs.prealloc_blob)
+                       ceph_buffer_put(ci->i_xattrs.prealloc_blob);
                ci->i_xattrs.prealloc_blob = blob;
                goto retry;
        }