diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-10-25 18:47:37 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-11-15 22:04:17 -0500 |
commit | b26d4cd385fc51e8844e2cdf9ba2051f5bba11a5 (patch) | |
tree | fcfa7a889b494945abf5705562c0384f88924f78 /fs/hostfs | |
parent | 951b4bd553e35a291e6b5732ab0124619e81da05 (diff) |
consolidate simple ->d_delete() instances
Rename simple_delete_dentry() to always_delete_dentry() and export it.
Export simple_dentry_operations, while we are at it, and get rid of
their duplicates
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/hostfs')
-rw-r--r-- | fs/hostfs/hostfs_kern.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 25437280a207..db23ce1bd903 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c | |||
@@ -33,15 +33,6 @@ static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode) | |||
33 | 33 | ||
34 | #define FILE_HOSTFS_I(file) HOSTFS_I(file_inode(file)) | 34 | #define FILE_HOSTFS_I(file) HOSTFS_I(file_inode(file)) |
35 | 35 | ||
36 | static int hostfs_d_delete(const struct dentry *dentry) | ||
37 | { | ||
38 | return 1; | ||
39 | } | ||
40 | |||
41 | static const struct dentry_operations hostfs_dentry_ops = { | ||
42 | .d_delete = hostfs_d_delete, | ||
43 | }; | ||
44 | |||
45 | /* Changed in hostfs_args before the kernel starts running */ | 36 | /* Changed in hostfs_args before the kernel starts running */ |
46 | static char *root_ino = ""; | 37 | static char *root_ino = ""; |
47 | static int append = 0; | 38 | static int append = 0; |
@@ -925,7 +916,7 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) | |||
925 | sb->s_blocksize_bits = 10; | 916 | sb->s_blocksize_bits = 10; |
926 | sb->s_magic = HOSTFS_SUPER_MAGIC; | 917 | sb->s_magic = HOSTFS_SUPER_MAGIC; |
927 | sb->s_op = &hostfs_sbops; | 918 | sb->s_op = &hostfs_sbops; |
928 | sb->s_d_op = &hostfs_dentry_ops; | 919 | sb->s_d_op = &simple_dentry_operations; |
929 | sb->s_maxbytes = MAX_LFS_FILESIZE; | 920 | sb->s_maxbytes = MAX_LFS_FILESIZE; |
930 | 921 | ||
931 | /* NULL is printed as <NULL> by sprintf: avoid that. */ | 922 | /* NULL is printed as <NULL> by sprintf: avoid that. */ |