442,443c442,445
< ok = (lock_rename(workdir, upperdir) == NULL);
< unlock_rename(workdir, upperdir);
---
> struct dentry *trap = lock_rename(workdir, upperdir);
> if (!IS_ERR(trap))
> unlock_rename(workdir, upperdir);
> ok = (trap == NULL);