We'll introduce a @work_struct field for @object in subsequent patches,
it will enlarge the size of @object.
As the result of that, this commit extracts ondemand info field from
@object.
Signed-off-by: Jia Zhu <[email protected]>
---
fs/cachefiles/interface.c | 6 ++++++
fs/cachefiles/internal.h | 26 ++++++++++++++++++++------
fs/cachefiles/ondemand.c | 28 ++++++++++++++++++++++------
3 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c
index a69073a1d3f0..690e3e1ee661 100644
--- a/fs/cachefiles/interface.c
+++ b/fs/cachefiles/interface.c
@@ -31,6 +31,11 @@ struct cachefiles_object *cachefiles_alloc_object(struct fscache_cookie *cookie)
if (!object)
return NULL;
+ if (cachefiles_ondemand_init_obj_info(object, volume)) {
+ kmem_cache_free(cachefiles_object_jar, object);
+ return NULL;
+ }
+
refcount_set(&object->ref, 1);
spin_lock_init(&object->lock);
@@ -88,6 +93,7 @@ void cachefiles_put_object(struct cachefiles_object *object,
ASSERTCMP(object->file, ==, NULL);
kfree(object->d_name);
+ kfree(object->private);
cache = object->volume->cache->cache;
fscache_put_cookie(object->cookie, fscache_cookie_put_object);
diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
index 2dcc8b6ad536..f6cc9a89b6d4 100644
--- a/fs/cachefiles/internal.h
+++ b/fs/cachefiles/internal.h
@@ -50,6 +50,12 @@ enum cachefiles_object_state {
CACHEFILES_ONDEMAND_OBJSTATE_open, /* Anonymous fd associated with object is available */
};
+struct cachefiles_ondemand_info {
+ int ondemand_id;
+ enum cachefiles_object_state state;
+ struct cachefiles_object *object;
+};
+
/*
* Backing file state.
*/
@@ -66,10 +72,7 @@ struct cachefiles_object {
enum cachefiles_content content_info:8; /* Info about content presence */
unsigned long flags;
#define CACHEFILES_OBJECT_USING_TMPFILE 0 /* Have an unlinked tmpfile */
-#ifdef CONFIG_CACHEFILES_ONDEMAND
- int ondemand_id;
- enum cachefiles_object_state state;
-#endif
+ struct cachefiles_ondemand_info *private;
};
#define CACHEFILES_ONDEMAND_ID_CLOSED -1
@@ -303,6 +306,9 @@ extern void cachefiles_ondemand_clean_object(struct cachefiles_object *object);
extern int cachefiles_ondemand_read(struct cachefiles_object *object,
loff_t pos, size_t len);
+extern int cachefiles_ondemand_init_obj_info(struct cachefiles_object *object,
+ struct cachefiles_volume *volume);
+
#define CACHEFILES_OBJECT_STATE_FUNCS(_state) \
static inline bool \
cachefiles_ondemand_object_is_##_state(const struct cachefiles_object *object) \
@@ -313,7 +319,8 @@ cachefiles_ondemand_object_is_##_state(const struct cachefiles_object *object) \
* a RELEASE barrier. We need to use smp_load_acquire() here
* to safely ACQUIRE the memory the other task published.
*/ \
- return smp_load_acquire(&object->state) == CACHEFILES_ONDEMAND_OBJSTATE_##_state; \
+ return smp_load_acquire(&(object->private->state)) == \
+ CACHEFILES_ONDEMAND_OBJSTATE_##_state; \
} \
\
static inline void \
@@ -324,7 +331,8 @@ cachefiles_ondemand_set_object_##_state(struct cachefiles_object *object) \
* I.e. here we publish a state with a RELEASE barrier
* so that concurrent tasks can ACQUIRE it.
*/ \
- smp_store_release(&object->state, CACHEFILES_ONDEMAND_OBJSTATE_##_state); \
+ smp_store_release(&(object->private->state), \
+ CACHEFILES_ONDEMAND_OBJSTATE_##_state); \
}
CACHEFILES_OBJECT_STATE_FUNCS(open);
@@ -350,6 +358,12 @@ static inline int cachefiles_ondemand_read(struct cachefiles_object *object,
{
return -EOPNOTSUPP;
}
+
+static inline int cachefiles_ondemand_init_obj_info(struct cachefiles_object *object,
+ struct cachefiles_volume *volume)
+{
+ return 0;
+}
#endif
/*
diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c
index e81d72c7bb4c..54581d59847a 100644
--- a/fs/cachefiles/ondemand.c
+++ b/fs/cachefiles/ondemand.c
@@ -9,12 +9,13 @@ static int cachefiles_ondemand_fd_release(struct inode *inode,
{
struct cachefiles_object *object = file->private_data;
struct cachefiles_cache *cache = object->volume->cache;
- int object_id = object->ondemand_id;
+ struct cachefiles_ondemand_info *info = object->private;
+ int object_id = info->ondemand_id;
struct cachefiles_req *req;
XA_STATE(xas, &cache->reqs, 0);
xa_lock(&cache->reqs);
- object->ondemand_id = CACHEFILES_ONDEMAND_ID_CLOSED;
+ info->ondemand_id = CACHEFILES_ONDEMAND_ID_CLOSED;
cachefiles_ondemand_set_object_close(object);
/*
@@ -222,7 +223,7 @@ static int cachefiles_ondemand_get_fd(struct cachefiles_req *req)
load = (void *)req->msg.data;
load->fd = fd;
req->msg.object_id = object_id;
- object->ondemand_id = object_id;
+ object->private->ondemand_id = object_id;
cachefiles_get_unbind_pincount(cache);
trace_cachefiles_ondemand_open(object, &req->msg, load);
@@ -368,7 +369,7 @@ static int cachefiles_ondemand_send_req(struct cachefiles_object *object,
if (opcode != CACHEFILES_OP_OPEN &&
!cachefiles_ondemand_object_is_open(object)) {
- WARN_ON_ONCE(object->ondemand_id == 0);
+ WARN_ON_ONCE(object->private->ondemand_id == 0);
xas_unlock(&xas);
ret = -EIO;
goto out;
@@ -444,7 +445,7 @@ static int cachefiles_ondemand_init_close_req(struct cachefiles_req *req,
if (!cachefiles_ondemand_object_is_open(object))
return -ENOENT;
- req->msg.object_id = object->ondemand_id;
+ req->msg.object_id = object->private->ondemand_id;
trace_cachefiles_ondemand_close(object, &req->msg);
return 0;
}
@@ -460,7 +461,7 @@ static int cachefiles_ondemand_init_read_req(struct cachefiles_req *req,
struct cachefiles_object *object = req->object;
struct cachefiles_read *load = (void *)req->msg.data;
struct cachefiles_read_ctx *read_ctx = private;
- int object_id = object->ondemand_id;
+ int object_id = object->private->ondemand_id;
/* Stop enqueuing requests when daemon has closed anon_fd. */
if (!cachefiles_ondemand_object_is_open(object)) {
@@ -506,6 +507,21 @@ void cachefiles_ondemand_clean_object(struct cachefiles_object *object)
cachefiles_ondemand_init_close_req, NULL);
}
+int cachefiles_ondemand_init_obj_info(struct cachefiles_object *object,
+ struct cachefiles_volume *volume)
+{
+ if (!cachefiles_in_ondemand_mode(volume->cache))
+ return 0;
+
+ object->private = kzalloc(sizeof(struct cachefiles_ondemand_info),
+ GFP_KERNEL);
+ if (!object->private)
+ return -ENOMEM;
+
+ object->private->object = object;
+ return 0;
+}
+
int cachefiles_ondemand_read(struct cachefiles_object *object,
loff_t pos, size_t len)
{
--
2.20.1