fs/ntfs3: Use wait_on_buffer() directly

wait_on_buffer() checks buffer_locked() internally
before calling __wait_on_buffer().

Signed-off-by: Lalit Shankar Chowdhury <lalitshankarch@gmail.com>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c
index 5f138f7158357749c34937dab202bfd1916b5bf8..a3cb39ff470f0e3740958be3d001849c8c9fab82 100644 (file)
--- a/fs/ntfs3/fsntfs.c
+++ b/fs/ntfs3/fsntfs.c
@@ -875,9 +875,7 @@ void ntfs_update_mftmirr(struct ntfs_sb_info *sbi, int wait)
                        return;
                }
 
-               if (buffer_locked(bh2))
-                       __wait_on_buffer(bh2);
-
+               wait_on_buffer(bh2);
                lock_buffer(bh2);
                memcpy(bh2->b_data, bh1->b_data, blocksize);
                set_buffer_uptodate(bh2);
@@ -1069,9 +1067,7 @@ int ntfs_sb_write(struct super_block *sb, u64 lbo, size_t bytes,
                                return -ENOMEM;
                }
 
-               if (buffer_locked(bh))
-                       __wait_on_buffer(bh);
-
+               wait_on_buffer(bh);
                lock_buffer(bh);
                if (buf) {
                        memcpy(bh->b_data + off, buf, op);
@@ -1347,8 +1343,8 @@ int ntfs_get_bh(struct ntfs_sb_info *sbi, const struct runs_tree *run, u64 vbo,
                                        err = -ENOMEM;
                                        goto out;
                                }
-                               if (buffer_locked(bh))
-                                       __wait_on_buffer(bh);
+
+                               wait_on_buffer(bh);
 
                                lock_buffer(bh);
                                if (!buffer_uptodate(bh))
@@ -1427,9 +1423,7 @@ int ntfs_write_bh(struct ntfs_sb_info *sbi, struct NTFS_RECORD_HEADER *rhdr,
                if (op > bytes)
                        op = bytes;
 
-               if (buffer_locked(bh))
-                       __wait_on_buffer(bh);
-
+               wait_on_buffer(bh);
                lock_buffer(bh);
 
                bh_data = bh->b_data + off;

diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c
index 75b94beac1613a9044661b9e18b45f44ff0be2ec..7c7bae84ec9ac058572d1e6986101931311b5653 100644 (file)
--- a/fs/ntfs3/index.c
+++ b/fs/ntfs3/index.c
@@ -252,9 +252,7 @@ static int bmp_buf_get(struct ntfs_index *indx, struct ntfs_inode *ni,
 
        bbuf->bh = bh;
 
-       if (buffer_locked(bh))
-               __wait_on_buffer(bh);
-
+       wait_on_buffer(bh);
        lock_buffer(bh);
 
        sb = sbi->sb;

diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index 8b0cf0ed4f72cc643b2b42fc491b259cf19fe3b8..1acc685625f73c97601588a41ac8b282fef1744f 100644 (file)
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@ -1652,9 +1652,7 @@ load_root:
                 */
                struct buffer_head *bh0 = sb_getblk(sb, 0);
                if (bh0) {
-                       if (buffer_locked(bh0))
-                               __wait_on_buffer(bh0);
-
+                       wait_on_buffer(bh0);
                        lock_buffer(bh0);
                        memcpy(bh0->b_data, boot2, sizeof(*boot2));
                        set_buffer_uptodate(bh0);