From: Dave Chinner Date: Wed, 25 Mar 2015 03:03:32 +0000 (+1100) Subject: xfs: clean up inode locking for RENAME_WHITEOUT X-Git-Tag: omap-for-v4.1/fixes-rc1~44^2~4^2~4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95afcf5c7bca93fb84d260f70c304f35ef4c3114;p=pandora-kernel.git xfs: clean up inode locking for RENAME_WHITEOUT When doing RENAME_WHITEOUT, we now have to lock 5 inodes into the rename transaction. This means we need to update xfs_sort_for_rename() and xfs_lock_inodes() to handle up to 5 inodes. Because of the vagaries of rename, this means we could have anywhere between 3 and 5 inodes locked into the transaction.... While xfs_lock_inodes() does not need anything other than an assert telling us we are passing more inodes that we ever thought we should see, it could do with a logic rework to remove all the indenting. This is not a functional change - it just makes the code a lot easier to read. Signed-off-by: Dave Chinner Reviewed-by: Eric Sandeen Reviewed-by: Brian Foster Signed-off-by: Dave Chinner --- Reading git-diff-tree failed