diff mbox series

[3/9] fscache,netfs: rename netfs_io_terminated_t as fscache_io_terminated_t

Message ID 20221027083547.46933-4-jefflexu@linux.alibaba.com
State New
Headers
Series fscache,netfs: decouple raw fscache APIs from libnetfs |

Commit Message

Jingbo Xu Oct. 27, 2022, 8:35 a.m. UTC 
  Rename netfs_io_terminated_t as fscache_io_terminated_t to make raw
fscache APIs more neutral independent on libnetfs.

This is a cleanup without logic change.

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
 fs/cachefiles/internal.h | 2 +-
 fs/cachefiles/io.c       | 8 ++++----
 fs/fscache/io.c          | 4 ++--
 include/linux/fscache.h  | 8 ++++----
 include/linux/netfs.h    | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

Comments

David Howells Oct. 27, 2022, 1:06 p.m. UTC | #1 
Jingbo Xu <jefflexu@linux.alibaba.com> wrote:

> Rename netfs_io_terminated_t as fscache_io_terminated_t to make raw
> fscache APIs more neutral independent on libnetfs.

Please don't.  This is a netfslib feature that happens to be used by fscache.

David
diff mbox series

Patch

diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
index 2ad58c465208..897cc01b8b56 100644
--- a/fs/cachefiles/internal.h
+++ b/fs/cachefiles/internal.h
@@ -239,7 +239,7 @@  extern int __cachefiles_write(struct cachefiles_object *object,
 			      struct file *file,
 			      loff_t start_pos,
 			      struct iov_iter *iter,
-			      netfs_io_terminated_t term_func,
+			      fscache_io_terminated_t term_func,
 			      void *term_func_priv);
 
 /*
diff --git a/fs/cachefiles/io.c b/fs/cachefiles/io.c
index 9214060b4781..6931032b837c 100644
--- a/fs/cachefiles/io.c
+++ b/fs/cachefiles/io.c
@@ -23,7 +23,7 @@  struct cachefiles_kiocb {
 		size_t		len;
 	};
 	struct cachefiles_object *object;
-	netfs_io_terminated_t	term_func;
+	fscache_io_terminated_t	term_func;
 	void			*term_func_priv;
 	bool			was_async;
 	unsigned int		inval_counter;	/* Copy of cookie->inval_counter */
@@ -74,7 +74,7 @@  static int cachefiles_read(struct netfs_cache_resources *cres,
 			   loff_t start_pos,
 			   struct iov_iter *iter,
 			   enum netfs_read_from_hole read_hole,
-			   netfs_io_terminated_t term_func,
+			   fscache_io_terminated_t term_func,
 			   void *term_func_priv)
 {
 	struct cachefiles_object *object;
@@ -281,7 +281,7 @@  int __cachefiles_write(struct cachefiles_object *object,
 		       struct file *file,
 		       loff_t start_pos,
 		       struct iov_iter *iter,
-		       netfs_io_terminated_t term_func,
+		       fscache_io_terminated_t term_func,
 		       void *term_func_priv)
 {
 	struct cachefiles_cache *cache;
@@ -370,7 +370,7 @@  int __cachefiles_write(struct cachefiles_object *object,
 static int cachefiles_write(struct netfs_cache_resources *cres,
 			    loff_t start_pos,
 			    struct iov_iter *iter,
-			    netfs_io_terminated_t term_func,
+			    fscache_io_terminated_t term_func,
 			    void *term_func_priv)
 {
 	if (!fscache_wait_for_operation(cres, FSCACHE_WANT_WRITE)) {
diff --git a/fs/fscache/io.c b/fs/fscache/io.c
index 3af3b08a9bb3..3ef93fdcb3b3 100644
--- a/fs/fscache/io.c
+++ b/fs/fscache/io.c
@@ -204,7 +204,7 @@  struct fscache_write_request {
 	loff_t			start;
 	size_t			len;
 	bool			set_bits;
-	netfs_io_terminated_t	term_func;
+	fscache_io_terminated_t	term_func;
 	void			*term_func_priv;
 };
 
@@ -248,7 +248,7 @@  static void fscache_wreq_done(void *priv, ssize_t transferred_or_error,
 void __fscache_write_to_cache(struct fscache_cookie *cookie,
 			      struct address_space *mapping,
 			      loff_t start, size_t len, loff_t i_size,
-			      netfs_io_terminated_t term_func,
+			      fscache_io_terminated_t term_func,
 			      void *term_func_priv,
 			      bool cond)
 {
diff --git a/include/linux/fscache.h b/include/linux/fscache.h
index 36e5dd84cf59..ee8e14f142e8 100644
--- a/include/linux/fscache.h
+++ b/include/linux/fscache.h
@@ -173,7 +173,7 @@  extern int __fscache_begin_read_operation(struct netfs_cache_resources *, struct
 extern int __fscache_begin_write_operation(struct netfs_cache_resources *, struct fscache_cookie *);
 
 extern void __fscache_write_to_cache(struct fscache_cookie *, struct address_space *,
-				     loff_t, size_t, loff_t, netfs_io_terminated_t, void *,
+				     loff_t, size_t, loff_t, fscache_io_terminated_t, void *,
 				     bool);
 extern void __fscache_clear_page_bits(struct address_space *, loff_t, size_t);
 
@@ -508,7 +508,7 @@  int fscache_read(struct netfs_cache_resources *cres,
 		 loff_t start_pos,
 		 struct iov_iter *iter,
 		 enum netfs_read_from_hole read_hole,
-		 netfs_io_terminated_t term_func,
+		 fscache_io_terminated_t term_func,
 		 void *term_func_priv)
 {
 	const struct netfs_cache_ops *ops = fscache_operation_valid(cres);
@@ -566,7 +566,7 @@  static inline
 int fscache_write(struct netfs_cache_resources *cres,
 		  loff_t start_pos,
 		  struct iov_iter *iter,
-		  netfs_io_terminated_t term_func,
+		  fscache_io_terminated_t term_func,
 		  void *term_func_priv)
 {
 	const struct netfs_cache_ops *ops = fscache_operation_valid(cres);
@@ -617,7 +617,7 @@  static inline void fscache_clear_page_bits(struct address_space *mapping,
 static inline void fscache_write_to_cache(struct fscache_cookie *cookie,
 					  struct address_space *mapping,
 					  loff_t start, size_t len, loff_t i_size,
-					  netfs_io_terminated_t term_func,
+					  fscache_io_terminated_t term_func,
 					  void *term_func_priv,
 					  bool caching)
 {
diff --git a/include/linux/netfs.h b/include/linux/netfs.h
index 4cd7341c79b4..2cac478607a8 100644
--- a/include/linux/netfs.h
+++ b/include/linux/netfs.h
@@ -115,7 +115,7 @@  enum fscache_io_source {
 	FSCACHE_INVALID_READ,
 } __mode(byte);
 
-typedef void (*netfs_io_terminated_t)(void *priv, ssize_t transferred_or_error,
+typedef void (*fscache_io_terminated_t)(void *priv, ssize_t transferred_or_error,
 				      bool was_async);
 
 /*
@@ -240,14 +240,14 @@  struct netfs_cache_ops {
 		    loff_t start_pos,
 		    struct iov_iter *iter,
 		    enum netfs_read_from_hole read_hole,
-		    netfs_io_terminated_t term_func,
+		    fscache_io_terminated_t term_func,
 		    void *term_func_priv);
 
 	/* Write data to the cache */
 	int (*write)(struct netfs_cache_resources *cres,
 		     loff_t start_pos,
 		     struct iov_iter *iter,
-		     netfs_io_terminated_t term_func,
+		     fscache_io_terminated_t term_func,
 		     void *term_func_priv);
 
 	/* Expand readahead request */