This is a combined patch that has:

* changes made by Christoph Hellwig
* code segment that handles f_locks so we would not walk inode->i_flock 
list twice.

If agreed, please re-add your "ack-by" and "signed-off" lines 
respectively. Thanks ...

-- Wendy