aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-01-12 16:25:02 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2011-01-12 20:02:48 -0500
commit9501e4c48e1561443e1a16c2c9917ec6c63118a4 (patch)
treeb3b0a5117443153dd4b8703321862207887470ee /fs
parentb5c7d208ca48e7769aa38731665283790de49840 (diff)
switch coda
Coda ->d_revalidate() actually checks for root, ->d_delete() is irrelevant. So we can use the same d_op for all coda dentries Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/coda/dir.c4
-rw-r--r--fs/coda/inode.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 29badd91360f..9df71f0eb218 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -61,7 +61,7 @@ static int coda_return_EIO(void)
61} 61}
62#define CODA_EIO_ERROR ((void *) (coda_return_EIO)) 62#define CODA_EIO_ERROR ((void *) (coda_return_EIO))
63 63
64static const struct dentry_operations coda_dentry_operations = 64const struct dentry_operations coda_dentry_operations =
65{ 65{
66 .d_revalidate = coda_dentry_revalidate, 66 .d_revalidate = coda_dentry_revalidate,
67 .d_delete = coda_dentry_delete, 67 .d_delete = coda_dentry_delete,
@@ -126,8 +126,6 @@ static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, struc
126 return ERR_PTR(error); 126 return ERR_PTR(error);
127 127
128exit: 128exit:
129 d_set_d_op(entry, &coda_dentry_operations);
130
131 if (inode && (type & CODA_NOCACHE)) 129 if (inode && (type & CODA_NOCACHE))
132 coda_flag_inode(inode, C_VATTR | C_PURGE); 130 coda_flag_inode(inode, C_VATTR | C_PURGE);
133 131
diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index 50dc7d189f56..bd7fde2721a8 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -193,6 +193,7 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
193 sb->s_blocksize_bits = 12; 193 sb->s_blocksize_bits = 12;
194 sb->s_magic = CODA_SUPER_MAGIC; 194 sb->s_magic = CODA_SUPER_MAGIC;
195 sb->s_op = &coda_super_operations; 195 sb->s_op = &coda_super_operations;
196 sb->s_d_op = &coda_dentry_operations;
196 sb->s_bdi = &vc->bdi; 197 sb->s_bdi = &vc->bdi;
197 198
198 /* get root fid from Venus: this needs the root inode */ 199 /* get root fid from Venus: this needs the root inode */