orangefs: rename remaining bits of mmap readahead cache

This has been dormant code for many years. Parts of it were removed from
the OrangeFS kernel code when it went into mainline. These bits were missed.
Now the readahead cache has been resurrected in the OrangeFS userspace
portions. It was renamed there, since it doesn't really have anything to do
with mmap specifically, so it will be renamed here.

Signed-off-by: Martin Brandenburg <martin@omnibond.com>

5 files changed, 7 insertions, 7 deletions

diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index 526040e09f78..c14eab567f56 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -591,7 +591,7 @@ static int orangefs_file_release(struct inode *inode, struct file *file)
         orangefs_flush_inode(inode);
 
         /*
-         * remove all associated inode pages from the page cache and mmap
+         * remove all associated inode pages from the page cache and
          * readahead cache (if any); this forces an expensive refresh of
          * data for the next caller of mmap (or 'get_block' accesses)
          */
diff --git a/fs/orangefs/orangefs-cache.c b/fs/orangefs/orangefs-cache.c
index b6edbe9fb309..eb0b6e00b519 100644
--- a/fs/orangefs/orangefs-cache.c
+++ b/fs/orangefs/orangefs-cache.c
@@ -73,8 +73,8 @@ char *get_opname_string(struct orangefs_kernel_op_s *new_op)
                         return "OP_STATFS";
                 else if (type == ORANGEFS_VFS_OP_TRUNCATE)
                         return "OP_TRUNCATE";
-                else if (type == ORANGEFS_VFS_OP_MMAP_RA_FLUSH)
-                        return "OP_MMAP_RA_FLUSH";
+                else if (type == ORANGEFS_VFS_OP_RA_FLUSH)
+                        return "OP_RA_FLUSH";
                 else if (type == ORANGEFS_VFS_OP_FS_MOUNT)
                         return "OP_FS_MOUNT";
                 else if (type == ORANGEFS_VFS_OP_FS_UMOUNT)
diff --git a/fs/orangefs/orangefs-dev-proto.h b/fs/orangefs/orangefs-dev-proto.h
index 9eac9d9a3f3a..71902899b1da 100644
--- a/fs/orangefs/orangefs-dev-proto.h
+++ b/fs/orangefs/orangefs-dev-proto.h
@@ -28,7 +28,7 @@
 #define ORANGEFS_VFS_OP_RENAME         0xFF00000A
 #define ORANGEFS_VFS_OP_STATFS         0xFF00000B
 #define ORANGEFS_VFS_OP_TRUNCATE       0xFF00000C
-#define ORANGEFS_VFS_OP_MMAP_RA_FLUSH  0xFF00000D
+#define ORANGEFS_VFS_OP_RA_FLUSH       0xFF00000D
 #define ORANGEFS_VFS_OP_FS_MOUNT       0xFF00000E
 #define ORANGEFS_VFS_OP_FS_UMOUNT      0xFF00000F
 #define ORANGEFS_VFS_OP_GETXATTR       0xFF000010
diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index d13c7291fd05..9a99285fe310 100644
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -50,7 +50,7 @@ __s32 fsid_of_op(struct orangefs_kernel_op_s *op)
                 case ORANGEFS_VFS_OP_TRUNCATE:
                         fsid = op->upcall.req.truncate.refn.fs_id;
                         break;
-                case ORANGEFS_VFS_OP_MMAP_RA_FLUSH:
+                case ORANGEFS_VFS_OP_RA_FLUSH:
                         fsid = op->upcall.req.ra_cache_flush.refn.fs_id;
                         break;
                 case ORANGEFS_VFS_OP_FS_UMOUNT:
diff --git a/fs/orangefs/upcall.h b/fs/orangefs/upcall.h
index 001b20239407..93965fb484e9 100644
--- a/fs/orangefs/upcall.h
+++ b/fs/orangefs/upcall.h
@@ -98,7 +98,7 @@ struct orangefs_truncate_request_s {
         __s64 size;
 };
 
-struct orangefs_mmap_ra_cache_flush_request_s {
+struct orangefs_ra_cache_flush_request_s {
         struct orangefs_object_kref refn;
 };
 
@@ -228,7 +228,7 @@ struct orangefs_upcall_s {
                 struct orangefs_rename_request_s rename;
                 struct orangefs_statfs_request_s statfs;
                 struct orangefs_truncate_request_s truncate;
-                struct orangefs_mmap_ra_cache_flush_request_s ra_cache_flush;
+                struct orangefs_ra_cache_flush_request_s ra_cache_flush;
                 struct orangefs_fs_mount_request_s fs_mount;
                 struct orangefs_fs_umount_request_s fs_umount;
                 struct orangefs_getxattr_request_s getxattr;