I'd be this is my new code added to xfs_buf_item_unpin, but I don't quite understand why. It's been a long time since I wrote that code, but I had to add that code to make sure we clear all buffers during a forced shutdown. Can you test if things go away if you just remove it (even if causes other hangs?)