aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_filestream.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-11-06 11:42:44 +0000
committerAlex Elder <aelder@sgi.com>2010-11-10 12:00:48 -0600
commit785ce41805ea7b6a9b2775ed9f4cf10cd7a90c03 (patch)
tree8b56f215db003db8984465697cebf2ce9aa119c9 /fs/xfs/xfs_filestream.c
parentbfe2741967eaa3434fa9b3d8f24b1422d4540e7d (diff)
downloadmrst-s0i3-test-785ce41805ea7b6a9b2775ed9f4cf10cd7a90c03.tar.gz
mrst-s0i3-test-785ce41805ea7b6a9b2775ed9f4cf10cd7a90c03.tar.xz
mrst-s0i3-test-785ce41805ea7b6a9b2775ed9f4cf10cd7a90c03.zip
xfs: tell lockdep about parent iolock usage in filestreams
The filestreams code may take the iolock on the parent inode while holding it on a child. This is the only place in XFS where we take both the child and parent iolock, so just telling lockdep about it is enough. The lock flag required for that was already added as part of the ilock lockdep annotations and unused so far. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_filestream.c')
-rw-r--r--fs/xfs/xfs_filestream.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index 9b715dce569..9124425b7f2 100644
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -744,9 +744,15 @@ xfs_filestream_new_ag(
* If the file's parent directory is known, take its iolock in exclusive
* mode to prevent two sibling files from racing each other to migrate
* themselves and their parent to different AGs.
+ *
+ * Note that we lock the parent directory iolock inside the child
+ * iolock here. That's fine as we never hold both parent and child
+ * iolock in any other place. This is different from the ilock,
+ * which requires locking of the child after the parent for namespace
+ * operations.
*/
if (pip)
- xfs_ilock(pip, XFS_IOLOCK_EXCL);
+ xfs_ilock(pip, XFS_IOLOCK_EXCL | XFS_IOLOCK_PARENT);
/*
* A new AG needs to be found for the file. If the file's parent