On Tue, Oct 27, 2009 at 10:36:18AM -0400, Eric Paris wrote: > On Wed, Oct 21, 2009 at 3:19 PM, Valerie Aurora <vaurora@xxxxxxxxxx> wrote: > > From: Jan Blunck <jblunck@xxxxxxx> > > > > Simply white-out a given directory entry. This functionality is usually used > > in the sense of unlink. Therefore the given dentry can still be in-use and > > contains an in-use inode. The filesystems inode operation has to do what > > unlink or rmdir would in that case. Since the dentry still might be in-use > > we have to provide a fresh unhashed dentry that is used as the whiteout > > dentry instead. The given dentry is dropped and the whiteout dentry is > > rehashed instead. > > > > Signed-off-by: Jan Blunck <jblunck@xxxxxxx> > > Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx> > > Signed-off-by: Valerie Aurora <vaurora@xxxxxxxxxx> > > --- > > ?fs/dcache.c ? ? ? ? ? ?| ? ?4 +- > > ?fs/namei.c ? ? ? ? ? ? | ?104 ++++++++++++++++++++++++++++++++++++++++++++++++ > > ?include/linux/dcache.h | ? ?6 +++ > > ?include/linux/fs.h ? ? | ? ?3 + > > ?4 files changed, 116 insertions(+), 1 deletions(-) > > > > > diff --git a/include/linux/dcache.h b/include/linux/dcache.h > > index 30b93b2..7648b49 100644 > > --- a/include/linux/dcache.h > > +++ b/include/linux/dcache.h > > @@ -183,6 +183,7 @@ d_iput: ? ? ? ? ? ? no ? ? ? ? ? ? ?no ? ? ? ? ? ? ?no ? ? ? yes > > ?#define DCACHE_INOTIFY_PARENT_WATCHED ?0x0020 /* Parent inode is watched by inotify */ > > > > ?#define DCACHE_COOKIE ? ? ? ? ?0x0040 ?/* For use by dcookie subsystem */ > > +#define DCACHE_WHITEOUT ? ? ? ? ? ? ? ?0x0080 ?/* This negative dentry is a whiteout */ > > > > ?#define DCACHE_FSNOTIFY_PARENT_WATCHED 0x0080 /* Parent inode is watched by some fsnotify listener */ > > > > I don't think you want 2 flags with the 0x0080 value....... This > can't be right. This looks like a merge error I introduced during a rebase. Thanks for catching it! -VAL -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
