reiserfs: replace open-coded atomic_dec_and_mutex_lock()

Replace the open-coded logic of atomic_dec_and_mutex_lock() in
reiserfs_file_release().

Link: https://lore.kernel.org/r/20191103094431.GA18576-nikitas.angelinas@gmail.com
Signed-off-by: Nikitas Angelinas <nikitas.angelinas@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 843aadcc123c2a12e04259e90dcc8dff2e779b03..84cf8bdbec9cb53de806930d58e49402a82a4bd5 100644 (file)
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -38,16 +38,10 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp)
 
        BUG_ON(!S_ISREG(inode->i_mode));
 
-        if (atomic_add_unless(&REISERFS_I(inode)->openers, -1, 1))
+       if (!atomic_dec_and_mutex_lock(&REISERFS_I(inode)->openers,
+                                      &REISERFS_I(inode)->tailpack))
                return 0;
 
-       mutex_lock(&REISERFS_I(inode)->tailpack);
-
-        if (!atomic_dec_and_test(&REISERFS_I(inode)->openers)) {
-               mutex_unlock(&REISERFS_I(inode)->tailpack);
-               return 0;
-       }
-
        /* fast out for when nothing needs to be done */
        if ((!(REISERFS_I(inode)->i_flags & i_pack_on_close_mask) ||
             !tail_has_to_be_packed(inode)) &&