LU-12593 osd: up i_append_sem during errors

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_io.c

diff --git a/lustre/osd-ldiskfs/osd_io.c b/lustre/osd-ldiskfs/osd_io.c
index 0cffae6..64b995d 100644 (file)
--- a/lustre/osd-ldiskfs/osd_io.c
+++ b/lustre/osd-ldiskfs/osd_io.c
@@ -1696,7 +1696,7 @@ static int osd_ldiskfs_write_record(struct dt_object *dt, void *buf,
         int                 boffs;
         int                 dirty_inode = 0;
        struct ldiskfs_inode_info *ei = LDISKFS_I(inode);
-       bool create, sparse;
+       bool create, sparse, sync = false;
 
        if (write_NUL) {
                /*
@@ -1714,7 +1714,6 @@ static int osd_ldiskfs_write_record(struct dt_object *dt, void *buf,
 
        while (bufsize > 0) {
                int credits = handle->h_buffer_credits;
-               bool sync;
                unsigned long last_block = (new_size == 0) ? 0 :
                                           (new_size - 1) >> inode->i_blkbits;
 
@@ -1751,8 +1750,10 @@ static int osd_ldiskfs_write_record(struct dt_object *dt, void *buf,
                        bh = __ldiskfs_bread(handle, inode, block, flags);
                        create = true;
                } else {
-                       if (sync)
+                       if (sync) {
                                up(&ei->i_append_sem);
+                               sync = false;
+                       }
                        create = false;
                }
                if (IS_ERR_OR_NULL(bh)) {
@@ -1781,8 +1782,10 @@ static int osd_ldiskfs_write_record(struct dt_object *dt, void *buf,
                         boffs, size, (unsigned long)bh->b_size);
                if (create) {
                        memset(bh->b_data, 0, bh->b_size);
-                       if (sync)
+                       if (sync) {
                                up(&ei->i_append_sem);
+                               sync = false;
+                       }
                }
                memcpy(bh->b_data + boffs, buf, size);
                err = ldiskfs_handle_dirty_metadata(handle, NULL, bh);
@@ -1795,8 +1798,11 @@ static int osd_ldiskfs_write_record(struct dt_object *dt, void *buf,
                 bufsize -= size;
                 buf += size;
         }
-        if (bh)
-                brelse(bh);
+       if (sync)
+               up(&ei->i_append_sem);
+
+       if (bh)
+               brelse(bh);
 
        if (write_NUL)
                --new_size;
@@ -2160,7 +2166,9 @@ void osd_execute_truncate(struct osd_object *obj)
                return;
        }
 
+       inode_lock(inode);
        ldiskfs_truncate(inode);
+       inode_unlock(inode);
 
        /*
         * For a partial-page truncate, flush the page to disk immediately to