ufs: deal with nfsd/iget races
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 27 Sep 2014 01:17:52 +0000 (21:17 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 27 Sep 2014 01:17:52 +0000 (21:17 -0400)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/ufs/ialloc.c
fs/ufs/namei.c

diff --cc fs/ufs/ialloc.c
Simple merge
diff --cc fs/ufs/namei.c
Simple merge