Update bcachefs sources to 9a555a741e80 bcachefs: omit alignment attribute on big...

[bcachefs-tools-debian] / libbcachefs / fs-common.c

diff --git a/libbcachefs/fs-common.c b/libbcachefs/fs-common.c
index 255857ca583734ceff89aa3df38e6523080c4dde..624e6f963240f82f56d4a111f5041e6fb1d9daa9 100644 (file)
--- a/libbcachefs/fs-common.c
+++ b/libbcachefs/fs-common.c
@@ -486,10 +486,10 @@ int bch2_rename_trans(struct btree_trans *trans,
                        goto err;
                }
 
-               if (S_ISDIR(dst_inode_u->bi_mode) &&
-                   bch2_empty_dir_trans(trans, dst_inum)) {
-                       ret = -ENOTEMPTY;
-                       goto err;
+               if (S_ISDIR(dst_inode_u->bi_mode)) {
+                       ret = bch2_empty_dir_trans(trans, dst_inum);
+                       if (ret)
+                               goto err;
                }
        }