diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2023-09-20 21:07:06 +0300 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2023-09-22 14:42:19 +0300 |
| commit | 21d9067efc7fe94d2bc6f7c7ce71834d5766bbd8 (patch) | |
| tree | 5b966591477981790bd6c3354913f2f3d11283c6 | |
| parent | b4bf3d5c37d404b05356869cdbd16450f3ba02a0 (diff) | |
| download | linux-21d9067efc7fe94d2bc6f7c7ce71834d5766bbd8.tar.xz | |
gfs2: Get rid of the gfs2_glock_is_held_* helpers
Those helpers don't add any clarity and are easy to use wrong. Spell
them out to make more obvious what's happening.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
| -rw-r--r-- | fs/gfs2/aops.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/glock.h | 15 | ||||
| -rw-r--r-- | fs/gfs2/inode.c | 2 |
3 files changed, 2 insertions, 17 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index c26d48355cc2..52fad5bcb047 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -155,7 +155,7 @@ static int gfs2_jdata_writepage(struct page *page, struct writeback_control *wbc struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_sbd *sdp = GFS2_SB(inode); - if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl))) + if (gfs2_assert_withdraw(sdp, ip->i_gl->gl_state == LM_ST_EXCLUSIVE)) goto out; if (folio_test_checked(folio) || current->journal_info) goto out_ignore; diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h index c8685ca7d2a2..4daad53f9436 100644 --- a/fs/gfs2/glock.h +++ b/fs/gfs2/glock.h @@ -156,21 +156,6 @@ out: return gh; } -static inline int gfs2_glock_is_held_excl(struct gfs2_glock *gl) -{ - return gl->gl_state == LM_ST_EXCLUSIVE; -} - -static inline int gfs2_glock_is_held_dfrd(struct gfs2_glock *gl) -{ - return gl->gl_state == LM_ST_DEFERRED; -} - -static inline int gfs2_glock_is_held_shrd(struct gfs2_glock *gl) -{ - return gl->gl_state == LM_ST_SHARED; -} - static inline struct address_space *gfs2_glock2aspace(struct gfs2_glock *gl) { if (gl->gl_ops->go_flags & GLOF_ASPACE) { diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 0eac04507904..2880d6ca19e1 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -2153,7 +2153,7 @@ static int gfs2_update_time(struct inode *inode, int flags) int error; gh = gfs2_glock_is_locked_by_me(gl); - if (gh && !gfs2_glock_is_held_excl(gl)) { + if (gh && gl->gl_state != LM_ST_EXCLUSIVE) { gfs2_glock_dq(gh); gfs2_holder_reinit(LM_ST_EXCLUSIVE, 0, gh); error = gfs2_glock_nq(gh); |