VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / fs / ext3 / ialloc.c

diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
index 0c21ea4..f30a4f4 100644 (file)
--- a/fs/ext3/ialloc.c
+++ b/fs/ext3/ialloc.c
@@ -446,9 +446,15 @@ struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode)
        inode = new_inode(sb);
        if (!inode)
                return ERR_PTR(-ENOMEM);
+
+       if (sb->s_flags & MS_TAGXID)
+               inode->i_xid = current->xid;
+       else
+               inode->i_xid = 0;
+
        if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) {
                err = -ENOSPC;
-               goto fail_dlim;
+               goto out;
        }
        ei = EXT3_I(inode);
 
@@ -626,7 +632,6 @@ got:
        goto really_out;
 fail:
        DLIMIT_FREE_INODE(sb, inode->i_xid);
-fail_dlim:
        ext3_std_error(sb, err);
 out:
        iput(inode);