Skip to content

Commit

Permalink
orangefs: rename remaining bits of mmap readahead cache
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Martin Brandenburg committed Aug 8, 2016
1 parent 8cbdd85 commit 6eaff8c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion fs/orangefs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
*/
Expand Down
4 changes: 2 additions & 2 deletions fs/orangefs/orangefs-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion fs/orangefs/orangefs-dev-proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fs/orangefs/orangefs-utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions fs/orangefs/upcall.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 6eaff8c

Please sign in to comment.