diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-24 13:06:06 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-26 07:26:47 -0400 |
| commit | 79bf7c732b5ff75b96022ed9d29181afd3d2509c (patch) | |
| tree | 74b8cc690f9a37fff02d0685464e1c695a25ef94 /fs/ceph/dir.c | |
| parent | 64252c75a2196a0cf1e0d3777143ecfe0e3ae650 (diff) | |
| download | blackbird-op-linux-79bf7c732b5ff75b96022ed9d29181afd3d2509c.tar.gz blackbird-op-linux-79bf7c732b5ff75b96022ed9d29181afd3d2509c.zip | |
vfs: push dentry_unhash on rmdir into file systems
Only a few file systems need this. Start by pushing it down into each
fs rmdir method (except gfs2 and xfs) so it can be dealt with on a per-fs
basis.
This does not change behavior for any in-tree file systems.
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ceph/dir.c')
| -rw-r--r-- | fs/ceph/dir.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 1a867a3601ae..d2e549023ded 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -827,6 +827,9 @@ static int ceph_unlink(struct inode *dir, struct dentry *dentry) int err = -EROFS; int op; + if ((dentry->d_inode->i_mode & S_IFMT) == S_IFDIR) + dentry_unhash(dentry); + if (ceph_snap(dir) == CEPH_SNAPDIR) { /* rmdir .snap/foo is RMSNAP */ dout("rmsnap dir %p '%.*s' dn %p\n", dir, dentry->d_name.len, |
