selinux: Remove security_ops extern

[linux.git] / fs / jbd2 / commit.c

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 5f26139a165a7081dd2f835222f26dcbc5d3bf4a..6fac743498565746bfb6dd5f29e0abacb48a0865 100644 (file)
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -43,7 +43,7 @@ static void journal_end_buffer_io_sync(struct buffer_head *bh, int uptodate)
                clear_buffer_uptodate(bh);
        if (orig_bh) {
                clear_bit_unlock(BH_Shadow, &orig_bh->b_state);
                clear_buffer_uptodate(bh);
        if (orig_bh) {
                clear_bit_unlock(BH_Shadow, &orig_bh->b_state);

-               smp_mb__after_clear_bit();
+               smp_mb__after_atomic();

                wake_up_bit(&orig_bh->b_state, BH_Shadow);
        }
        unlock_buffer(bh);
                wake_up_bit(&orig_bh->b_state, BH_Shadow);
        }
        unlock_buffer(bh);


@@ -239,7 +239,7 @@ static int journal_submit_data_buffers(journal_t *journal,
                spin_lock(&journal->j_list_lock);
                J_ASSERT(jinode->i_transaction == commit_transaction);
                clear_bit(__JI_COMMIT_RUNNING, &jinode->i_flags);
                spin_lock(&journal->j_list_lock);
                J_ASSERT(jinode->i_transaction == commit_transaction);
                clear_bit(__JI_COMMIT_RUNNING, &jinode->i_flags);

-               smp_mb__after_clear_bit();
+               smp_mb__after_atomic();

                wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING);
        }
        spin_unlock(&journal->j_list_lock);
                wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING);
        }
        spin_unlock(&journal->j_list_lock);


@@ -277,7 +277,7 @@ static int journal_finish_inode_data_buffers(journal_t *journal,
                }
                spin_lock(&journal->j_list_lock);
                clear_bit(__JI_COMMIT_RUNNING, &jinode->i_flags);
                }
                spin_lock(&journal->j_list_lock);
                clear_bit(__JI_COMMIT_RUNNING, &jinode->i_flags);

-               smp_mb__after_clear_bit();
+               smp_mb__after_atomic();

                wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING);
        }
 
                wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING);
        }