[PATCH 07/13] vfs: lock_two_nondirectories: allow directory args

[Miklos Szeredi]

From: Miklos Szeredi <mszeredi@xxxxxxx>

lock_two_nondirectories warned if either of its args was a directory.
Instead just ignore the directory args.  This is needed for locking in
cross rename.

Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
---
 fs/inode.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/fs/inode.c b/fs/inode.c
index 4bcdad3c9361..763010771cf4 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -944,18 +944,21 @@ EXPORT_SYMBOL(unlock_new_inode);
 
 /**
  * lock_two_nondirectories - take two i_mutexes on non-directory objects
+ *
+ * If either or both arguments are directories, then ignore those.
+ * Therefore zero, one or two objects may be locked by this function.
+ *
  * @inode1: first inode to lock
  * @inode2: second inode to lock
  */
 void lock_two_nondirectories(struct inode *inode1, struct inode *inode2)
 {
-	WARN_ON_ONCE(S_ISDIR(inode1->i_mode));
-	if (inode1 == inode2 || !inode2) {
+	if (S_ISDIR(inode1->i_mode)) {
+		if (inode2 && !S_ISDIR(inode2->i_mode))
+			mutex_lock(&inode2->i_mutex);
+	} else if (inode1 == inode2 || !inode2 || S_ISDIR(inode2->i_mode)) {
 		mutex_lock(&inode1->i_mutex);
-		return;
-	}
-	WARN_ON_ONCE(S_ISDIR(inode2->i_mode));
-	if (inode1 < inode2) {
+	} else if (inode1 < inode2) {
 		mutex_lock(&inode1->i_mutex);
 		mutex_lock_nested(&inode2->i_mutex, I_MUTEX_NONDIR2);
 	} else {
@@ -972,8 +975,9 @@ EXPORT_SYMBOL(lock_two_nondirectories);
  */
 void unlock_two_nondirectories(struct inode *inode1, struct inode *inode2)
 {
-	mutex_unlock(&inode1->i_mutex);
-	if (inode2 && inode2 != inode1)
+	if (!S_ISDIR(inode1->i_mode))
+		mutex_unlock(&inode1->i_mutex);
+	if (inode2 && inode2 != inode1 && !S_ISDIR(inode2->i_mode))
 		mutex_unlock(&inode2->i_mutex);
 }
 EXPORT_SYMBOL(unlock_two_nondirectories);
-- 
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/