ceph: cleanup ACCESS_ONCE -> READ_ONCE
PATCH 1/1 ceph: cleanup ACCESS_ONCE -> READ_ONCE
This removes the uses of ACCESS_ONCE in favor of READ_ONCE
Signed-off-by Seraphime Kirkovski <[email protected]>
--- fs/ceph/addr.c | 4 ++-- fs/ceph/caps.c | 2 +- fs/ceph/dir.c | 2 +- fs/ceph/inode.c | 2 +- fs/ceph/mds_client.c | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-)
fs/ceph/addr.c +2 -2
@@ -771,7 +771,7 @@ static int ceph_writepages_start(struct address_space *mapping, wbc->sync_mode ==WB_SYNC_NONE ?"NONE" : (wbc->sync_mode == WB_SYNC_ALL ? "ALL" : "HOLD")); -if (ACCESS_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) { +if (READ_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) {if (ci->i_wrbuffer_ref >0 ) { pr_warn_ratelimited( "writepage_start %p %lld forced umount\n",
@@ -1194,7 +1194,7 @@ static int ceph_update_writeable_page(struct file *file,int r;struct ceph_snap_context *snapc, *oldest; -if (ACCESS_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) { +if (READ_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) {dout (" page %p forced umount\n" , page);unlock_page (page);return -EIO ;
fs/ceph/caps.c +1 -1
@@ -2477,7 +2477,7 @@ static int try_get_cap_refs(struct ceph_inode_info *ci, int need, int want,if (ci->i_ceph_flags &CEPH_I_CAP_DROPPED ) {int mds_wanted; -if (ACCESS_ONCE (mdsc->fsc->mount_state) == +if (READ_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) {dout ("get_cap_refs %p forced umount\n" , inode); *err = -EIO ;
fs/ceph/dir.c +1 -1
@@ -1194,7 +1194,7 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)struct inode *dir;if (flags &LOOKUP_RCU ) { - parent =ACCESS_ONCE (dentry->d_parent); + parent =READ_ONCE (dentry->d_parent); dir =d_inode_rcu (parent);if (!dir)return -ECHILD ;
fs/ceph/inode.c +1 -1
@@ -1719,7 +1719,7 @@ static void ceph_invalidate_work(struct work_struct *work)mutex_lock (&ci->i_truncate_mutex); -if (ACCESS_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) { +if (READ_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) {pr_warn_ratelimited ("invalidate_pages %p %lld forced umount\n" , inode,ceph_ino (inode));mapping_set_error (inode->i_mapping, -EIO );
fs/ceph/mds_client.c +5 -5
@@ -1145,7 +1145,7 @@ static int remove_session_caps_cb(struct inode *inode, struct ceph_cap *cap, ci->i_ceph_flags |=CEPH_I_CAP_DROPPED ;if (ci->i_wrbuffer_ref >0 && -ACCESS_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) +READ_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) invalidate = true;while (!list_empty (&ci->i_cap_flush_list)) {
@@ -2095,12 +2095,12 @@ static int __do_request(struct ceph_mds_client *mdsc, err = -EIO ; goto finish; } -if (ACCESS_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) { +if (READ_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) {dout ("do_request forced umount\n" ); err = -EIO ; goto finish; } -if (ACCESS_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_MOUNTING ) { +if (READ_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_MOUNTING ) {if (mdsc->mdsmap_err) { err = mdsc->mdsmap_err;dout ("do_request mdsmap err %d\n" , err);
@@ -3550,7 +3550,7 @@ void ceph_mdsc_sync(struct ceph_mds_client *mdsc) {u64 want_tid, want_flush; -if (ACCESS_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) +if (READ_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN )return ;dout ("sync\n" );
@@ -3581,7 +3581,7 @@ void ceph_mdsc_sync(struct ceph_mds_client *mdsc)*/ static bool done_closing_sessions (struct ceph_mds_client *mdsc,int skipped) { -if (ACCESS_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) +if (READ_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN )return true;return atomic_read (&mdsc->num_sessions) <= skipped; }
Signature · 1 line
2.10.2
Yan, Zheng
AppliedQuoted 113 lines · Seraphime Kirkovski
This removes the uses of
ACCESS_ONCEin favor ofREAD_ONCESigned-off-by Seraphime Kirkovski <[email protected]>---
fs/ceph/addr.c | 4 ++-- fs/ceph/caps.c | 2 +- fs/ceph/dir.c | 2 +- fs/ceph/inode.c | 2 +- fs/ceph/mds_client.c | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-)fs/ceph/addr.c +2
-2@@ -771,7 +771,7 @@ static int ceph_writepages_start(struct address_space *mapping, wbc->sync_mode ==WB_SYNC_NONE ?"NONE" : (wbc->sync_mode == WB_SYNC_ALL ? "ALL" : "HOLD")); -if (ACCESS_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) { +if (READ_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) {if (ci->i_wrbuffer_ref >0 ) { pr_warn_ratelimited( "writepage_start %p %lld forced umount\n",@@ -1194,7 +1194,7 @@ static int ceph_update_writeable_page(struct file *file,int r;struct ceph_snap_context *snapc, *oldest; -if (ACCESS_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) { +if (READ_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) {dout (" page %p forced umount\n" , page);unlock_page (page);return -EIO ;fs/ceph/caps.c +1
-1@@ -2477,7 +2477,7 @@ static int try_get_cap_refs(struct ceph_inode_info *ci, int need, int want,if (ci->i_ceph_flags &CEPH_I_CAP_DROPPED ) {int mds_wanted; -if (ACCESS_ONCE (mdsc->fsc->mount_state) == +if (READ_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) {dout ("get_cap_refs %p forced umount\n" , inode); *err = -EIO ;fs/ceph/dir.c +1
-1@@ -1194,7 +1194,7 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)struct inode *dir;if (flags &LOOKUP_RCU ) { - parent =ACCESS_ONCE (dentry->d_parent); + parent =READ_ONCE (dentry->d_parent); dir =d_inode_rcu (parent);if (!dir)return -ECHILD ;fs/ceph/inode.c +1
-1@@ -1719,7 +1719,7 @@ static void ceph_invalidate_work(struct work_struct *work)mutex_lock (&ci->i_truncate_mutex); -if (ACCESS_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) { +if (READ_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) {pr_warn_ratelimited ("invalidate_pages %p %lld forced umount\n" , inode,ceph_ino (inode));mapping_set_error (inode->i_mapping, -EIO );fs/ceph/mds_client.c +4
-4@@ -1145,7 +1145,7 @@ static int remove_session_caps_cb(struct inode *inode, struct ceph_cap *cap, ci->i_ceph_flags |=CEPH_I_CAP_DROPPED ;if (ci->i_wrbuffer_ref >0 && -ACCESS_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) +READ_ONCE (fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) invalidate = true;while (!list_empty (&ci->i_cap_flush_list)) {@@ -2095,12 +2095,12 @@ static int __do_request(struct ceph_mds_client *mdsc, err = -EIO ; goto finish; } -if (ACCESS_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) { +if (READ_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) {dout ("do_request forced umount\n" ); err = -EIO ; goto finish; } -if (ACCESS_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_MOUNTING ) { +if (READ_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_MOUNTING ) {if (mdsc->mdsmap_err) { err = mdsc->mdsmap_err;dout ("do_request mdsmap err %d\n" , err);@@ -3550,7 +3550,7 @@ void ceph_mdsc_sync(struct ceph_mds_client *mdsc) {u64 want_tid, want_flush; -if (ACCESS_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) +if (READ_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN )return ;dout ("sync\n" );
fs/ceph/mds_client.c void ceph_mdsc_sync(struct ceph_mds_client *mdsc) · line 3587
Quoted 8 lines
fs/ceph/mds_client.c +1
-1@@ -3581,7 +3581,7 @@ void ceph_mdsc_sync(struct ceph_mds_client *mdsc)*/ static bool done_closing_sessions (struct ceph_mds_client *mdsc,int skipped) { -if (ACCESS_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN ) +if (READ_ONCE (mdsc->fsc->mount_state) ==CEPH_MOUNT_SHUTDOWN )return true;return atomic_read (&mdsc->num_sessions) <= skipped; }
Applied, Thanks
Yan, Zheng
Quoted 3 lines
Signature · 1 line
2.10.2