LU-6378 osd-ldiskfs: unlock inode before attr_init

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

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index c771ac5..2105a26 100644 (file)
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -2201,17 +2201,19 @@ static int __osd_object_create(struct osd_thread_info *info,
 
        result = osd_create_type_f(dof->dof_type)(info, obj, attr, hint, dof,
                                                  th);
-       if (result == 0) {
-               osd_attr_init(info, obj, attr, dof);
-               osd_object_init0(obj);
-       }
-
-       if (obj->oo_inode != NULL) {
+       if (likely(obj->oo_inode != NULL)) {
                LASSERT(obj->oo_inode->i_state & I_NEW);
 
+               /* Unlock the inode before attr initialization to avoid
+                * unnecessary dqget operations. LU-6378 */
                unlock_new_inode(obj->oo_inode);
        }
 
+       if (likely(result == 0)) {
+               osd_attr_init(info, obj, attr, dof);
+               osd_object_init0(obj);
+       }
+
        /* restore previous umask value */
        current->fs->umask = umask;