xfs
[Top] [All Lists]

Re: 2.6.27.7 vanilla, project quota enabled and process stuck in D state

To: Arkadiusz Miskiewicz <arekm@xxxxxxxx>
Subject: Re: 2.6.27.7 vanilla, project quota enabled and process stuck in D state (repeatable every time)
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Wed, 3 Dec 2008 17:42:44 -0500
Cc: xfs@xxxxxxxxxxx
In-reply-to: <20081203220724.GA13974@infradead.org>
References: <200812021949.55463.arekm@maven.pl> <200812031406.41882.arekm@maven.pl> <20081203213028.GW18236@disturbed> <200812032242.29326.arekm@maven.pl> <20081203220724.GA13974@infradead.org>
User-agent: Mutt/1.5.18 (2008-05-17)
For reason I don't understand myself yet this patch from my queue
fix it for me:


Signed-off-by: Christoph Hellwig <hch@xxxxxx>

Index: xfs/fs/xfs/xfs_rename.c
===================================================================
--- xfs.orig/fs/xfs/xfs_rename.c        2008-12-03 23:26:34.000000000 +0100
+++ xfs/fs/xfs/xfs_rename.c     2008-12-03 23:29:09.000000000 +0100
@@ -42,31 +42,6 @@
 
 
 /*
- * Given an array of up to 4 inode pointers, unlock the pointed to inodes.
  * If there are fewer than 4 entries in the array, the empty entries will
- * be at the end and will have NULL pointers in them.
- */
-STATIC void
-xfs_rename_unlock4(
-       xfs_inode_t     **i_tab,
-       uint            lock_mode)
-{
-       int     i;
-
-       xfs_iunlock(i_tab[0], lock_mode);
-       for (i = 1; i < 4; i++) {
-               if (i_tab[i] == NULL)
-                       break;
-
-               /*
-                * Watch out for duplicate entries in the table.
-                */
-               if (i_tab[i] != i_tab[i-1])
-                       xfs_iunlock(i_tab[i], lock_mode);
-       }
-}
-
-/*
  * Enter all inodes for a rename transaction into a sorted array.
  */
 STATIC void
@@ -205,19 +180,6 @@ xfs_rename(
        xfs_lock_inodes(inodes, num_inodes, XFS_ILOCK_EXCL);
 
        /*
-        * If we are using project inheritance, we only allow renames
-        * into our tree when the project IDs are the same; else the
-        * tree quota mechanism would be circumvented.
-        */
-       if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
-                    (target_dp->i_d.di_projid != src_ip->i_d.di_projid))) {
-               error = XFS_ERROR(EXDEV);
-               xfs_rename_unlock4(inodes, XFS_ILOCK_SHARED);
-               xfs_trans_cancel(tp, cancel_flags);
-               goto std_return;
-       }
-
-       /*
         * Join all the inodes to the transaction. From this point on,
         * we can rely on either trans_commit or trans_cancel to unlock
         * them.  Note that we need to add a vnode reference to the
@@ -242,6 +204,17 @@ xfs_rename(
        }
 
        /*
+        * If we are using project inheritance, we only allow renames
+        * into our tree when the project IDs are the same; else the
+        * tree quota mechanism would be circumvented.
+        */
+       if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
+                    (target_dp->i_d.di_projid != src_ip->i_d.di_projid))) {
+               error = XFS_ERROR(EXDEV);
+               goto error_return;
+       }
+
+       /*
         * Set up the target.
         */
        if (target_ip == NULL) {

<Prev in Thread] Current Thread [Next in Thread>