diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-02-20 00:55:13 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-03-27 14:44:00 -0400 |
commit | e16404ed0f3f330dc3e99b95cef69bb60bcd27f7 (patch) | |
tree | e60bf730a9a34ae3139ced51cdc9cbd90562fb24 | |
parent | f786aa90e026f2174bb0c26d49f338c5c46ede55 (diff) |
constify dentry_operations: misc filesystems
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/adfs/adfs.h | 2 | ||||
-rw-r--r-- | fs/adfs/dir.c | 2 | ||||
-rw-r--r-- | fs/affs/affs.h | 3 | ||||
-rw-r--r-- | fs/affs/namei.c | 4 | ||||
-rw-r--r-- | fs/coda/dir.c | 2 | ||||
-rw-r--r-- | fs/hfs/hfs_fs.h | 2 | ||||
-rw-r--r-- | fs/hfs/sysdep.c | 2 | ||||
-rw-r--r-- | fs/hfsplus/hfsplus_fs.h | 2 | ||||
-rw-r--r-- | fs/hfsplus/inode.c | 2 | ||||
-rw-r--r-- | fs/hostfs/hostfs_kern.c | 4 | ||||
-rw-r--r-- | fs/hpfs/dentry.c | 2 | ||||
-rw-r--r-- | fs/isofs/inode.c | 2 | ||||
-rw-r--r-- | fs/ncpfs/dir.c | 4 | ||||
-rw-r--r-- | fs/reiserfs/xattr.c | 2 | ||||
-rw-r--r-- | fs/smbfs/dir.c | 4 | ||||
-rw-r--r-- | fs/sysv/namei.c | 2 | ||||
-rw-r--r-- | fs/sysv/sysv.h | 2 | ||||
-rw-r--r-- | include/linux/ncp_fs.h | 2 |
18 files changed, 22 insertions, 23 deletions
diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h index 831157502d5a..e0a85dbeeb88 100644 --- a/fs/adfs/adfs.h +++ b/fs/adfs/adfs.h | |||
@@ -86,7 +86,7 @@ void __adfs_error(struct super_block *sb, const char *function, | |||
86 | /* dir_*.c */ | 86 | /* dir_*.c */ |
87 | extern const struct inode_operations adfs_dir_inode_operations; | 87 | extern const struct inode_operations adfs_dir_inode_operations; |
88 | extern const struct file_operations adfs_dir_operations; | 88 | extern const struct file_operations adfs_dir_operations; |
89 | extern struct dentry_operations adfs_dentry_operations; | 89 | extern const struct dentry_operations adfs_dentry_operations; |
90 | extern struct adfs_dir_ops adfs_f_dir_ops; | 90 | extern struct adfs_dir_ops adfs_f_dir_ops; |
91 | extern struct adfs_dir_ops adfs_fplus_dir_ops; | 91 | extern struct adfs_dir_ops adfs_fplus_dir_ops; |
92 | 92 | ||
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c index 85a30e929800..e867ccf37246 100644 --- a/fs/adfs/dir.c +++ b/fs/adfs/dir.c | |||
@@ -263,7 +263,7 @@ adfs_compare(struct dentry *parent, struct qstr *entry, struct qstr *name) | |||
263 | return 0; | 263 | return 0; |
264 | } | 264 | } |
265 | 265 | ||
266 | struct dentry_operations adfs_dentry_operations = { | 266 | const struct dentry_operations adfs_dentry_operations = { |
267 | .d_hash = adfs_hash, | 267 | .d_hash = adfs_hash, |
268 | .d_compare = adfs_compare, | 268 | .d_compare = adfs_compare, |
269 | }; | 269 | }; |
diff --git a/fs/affs/affs.h b/fs/affs/affs.h index e9ec915f7553..1a2d5e3c7f4e 100644 --- a/fs/affs/affs.h +++ b/fs/affs/affs.h | |||
@@ -199,8 +199,7 @@ extern const struct address_space_operations affs_symlink_aops; | |||
199 | extern const struct address_space_operations affs_aops; | 199 | extern const struct address_space_operations affs_aops; |
200 | extern const struct address_space_operations affs_aops_ofs; | 200 | extern const struct address_space_operations affs_aops_ofs; |
201 | 201 | ||
202 | extern struct dentry_operations affs_dentry_operations; | 202 | extern const struct dentry_operations affs_dentry_operations; |
203 | extern struct dentry_operations affs_dentry_operations_intl; | ||
204 | 203 | ||
205 | static inline void | 204 | static inline void |
206 | affs_set_blocksize(struct super_block *sb, int size) | 205 | affs_set_blocksize(struct super_block *sb, int size) |
diff --git a/fs/affs/namei.c b/fs/affs/namei.c index cfcf1b6cf82b..960d336ec694 100644 --- a/fs/affs/namei.c +++ b/fs/affs/namei.c | |||
@@ -19,12 +19,12 @@ static int affs_intl_toupper(int ch); | |||
19 | static int affs_intl_hash_dentry(struct dentry *, struct qstr *); | 19 | static int affs_intl_hash_dentry(struct dentry *, struct qstr *); |
20 | static int affs_intl_compare_dentry(struct dentry *, struct qstr *, struct qstr *); | 20 | static int affs_intl_compare_dentry(struct dentry *, struct qstr *, struct qstr *); |
21 | 21 | ||
22 | struct dentry_operations affs_dentry_operations = { | 22 | const struct dentry_operations affs_dentry_operations = { |
23 | .d_hash = affs_hash_dentry, | 23 | .d_hash = affs_hash_dentry, |
24 | .d_compare = affs_compare_dentry, | 24 | .d_compare = affs_compare_dentry, |
25 | }; | 25 | }; |
26 | 26 | ||
27 | static struct dentry_operations affs_intl_dentry_operations = { | 27 | static const struct dentry_operations affs_intl_dentry_operations = { |
28 | .d_hash = affs_intl_hash_dentry, | 28 | .d_hash = affs_intl_hash_dentry, |
29 | .d_compare = affs_intl_compare_dentry, | 29 | .d_compare = affs_intl_compare_dentry, |
30 | }; | 30 | }; |
diff --git a/fs/coda/dir.c b/fs/coda/dir.c index 75b1fa90b2cb..4bb9d0a5decc 100644 --- a/fs/coda/dir.c +++ b/fs/coda/dir.c | |||
@@ -59,7 +59,7 @@ static int coda_return_EIO(void) | |||
59 | } | 59 | } |
60 | #define CODA_EIO_ERROR ((void *) (coda_return_EIO)) | 60 | #define CODA_EIO_ERROR ((void *) (coda_return_EIO)) |
61 | 61 | ||
62 | static struct dentry_operations coda_dentry_operations = | 62 | static const struct dentry_operations coda_dentry_operations = |
63 | { | 63 | { |
64 | .d_revalidate = coda_dentry_revalidate, | 64 | .d_revalidate = coda_dentry_revalidate, |
65 | .d_delete = coda_dentry_delete, | 65 | .d_delete = coda_dentry_delete, |
diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h index 9955232fdf8c..052387e11671 100644 --- a/fs/hfs/hfs_fs.h +++ b/fs/hfs/hfs_fs.h | |||
@@ -213,7 +213,7 @@ extern void hfs_mdb_put(struct super_block *); | |||
213 | extern int hfs_part_find(struct super_block *, sector_t *, sector_t *); | 213 | extern int hfs_part_find(struct super_block *, sector_t *, sector_t *); |
214 | 214 | ||
215 | /* string.c */ | 215 | /* string.c */ |
216 | extern struct dentry_operations hfs_dentry_operations; | 216 | extern const struct dentry_operations hfs_dentry_operations; |
217 | 217 | ||
218 | extern int hfs_hash_dentry(struct dentry *, struct qstr *); | 218 | extern int hfs_hash_dentry(struct dentry *, struct qstr *); |
219 | extern int hfs_strcmp(const unsigned char *, unsigned int, | 219 | extern int hfs_strcmp(const unsigned char *, unsigned int, |
diff --git a/fs/hfs/sysdep.c b/fs/hfs/sysdep.c index 5bf89ec01cd4..7478f5c219aa 100644 --- a/fs/hfs/sysdep.c +++ b/fs/hfs/sysdep.c | |||
@@ -31,7 +31,7 @@ static int hfs_revalidate_dentry(struct dentry *dentry, struct nameidata *nd) | |||
31 | return 1; | 31 | return 1; |
32 | } | 32 | } |
33 | 33 | ||
34 | struct dentry_operations hfs_dentry_operations = | 34 | const struct dentry_operations hfs_dentry_operations = |
35 | { | 35 | { |
36 | .d_revalidate = hfs_revalidate_dentry, | 36 | .d_revalidate = hfs_revalidate_dentry, |
37 | .d_hash = hfs_hash_dentry, | 37 | .d_hash = hfs_hash_dentry, |
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h index f027a905225f..5c10d803d9df 100644 --- a/fs/hfsplus/hfsplus_fs.h +++ b/fs/hfsplus/hfsplus_fs.h | |||
@@ -327,7 +327,7 @@ void hfsplus_file_truncate(struct inode *); | |||
327 | /* inode.c */ | 327 | /* inode.c */ |
328 | extern const struct address_space_operations hfsplus_aops; | 328 | extern const struct address_space_operations hfsplus_aops; |
329 | extern const struct address_space_operations hfsplus_btree_aops; | 329 | extern const struct address_space_operations hfsplus_btree_aops; |
330 | extern struct dentry_operations hfsplus_dentry_operations; | 330 | extern const struct dentry_operations hfsplus_dentry_operations; |
331 | 331 | ||
332 | void hfsplus_inode_read_fork(struct inode *, struct hfsplus_fork_raw *); | 332 | void hfsplus_inode_read_fork(struct inode *, struct hfsplus_fork_raw *); |
333 | void hfsplus_inode_write_fork(struct inode *, struct hfsplus_fork_raw *); | 333 | void hfsplus_inode_write_fork(struct inode *, struct hfsplus_fork_raw *); |
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index f105ee9e1cc4..1bcf597c0562 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c | |||
@@ -137,7 +137,7 @@ const struct address_space_operations hfsplus_aops = { | |||
137 | .writepages = hfsplus_writepages, | 137 | .writepages = hfsplus_writepages, |
138 | }; | 138 | }; |
139 | 139 | ||
140 | struct dentry_operations hfsplus_dentry_operations = { | 140 | const struct dentry_operations hfsplus_dentry_operations = { |
141 | .d_hash = hfsplus_hash_dentry, | 141 | .d_hash = hfsplus_hash_dentry, |
142 | .d_compare = hfsplus_compare_dentry, | 142 | .d_compare = hfsplus_compare_dentry, |
143 | }; | 143 | }; |
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 5c538e0ec14b..fe02ad4740e7 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c | |||
@@ -31,12 +31,12 @@ static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode) | |||
31 | 31 | ||
32 | #define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_path.dentry->d_inode) | 32 | #define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_path.dentry->d_inode) |
33 | 33 | ||
34 | int hostfs_d_delete(struct dentry *dentry) | 34 | static int hostfs_d_delete(struct dentry *dentry) |
35 | { | 35 | { |
36 | return 1; | 36 | return 1; |
37 | } | 37 | } |
38 | 38 | ||
39 | struct dentry_operations hostfs_dentry_ops = { | 39 | static const struct dentry_operations hostfs_dentry_ops = { |
40 | .d_delete = hostfs_d_delete, | 40 | .d_delete = hostfs_d_delete, |
41 | }; | 41 | }; |
42 | 42 | ||
diff --git a/fs/hpfs/dentry.c b/fs/hpfs/dentry.c index 08319126b2af..940d6d150bee 100644 --- a/fs/hpfs/dentry.c +++ b/fs/hpfs/dentry.c | |||
@@ -49,7 +49,7 @@ static int hpfs_compare_dentry(struct dentry *dentry, struct qstr *a, struct qst | |||
49 | return 0; | 49 | return 0; |
50 | } | 50 | } |
51 | 51 | ||
52 | static struct dentry_operations hpfs_dentry_operations = { | 52 | static const struct dentry_operations hpfs_dentry_operations = { |
53 | .d_hash = hpfs_hash_dentry, | 53 | .d_hash = hpfs_hash_dentry, |
54 | .d_compare = hpfs_compare_dentry, | 54 | .d_compare = hpfs_compare_dentry, |
55 | }; | 55 | }; |
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 6147ec3643a0..13d2eddd0692 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
@@ -114,7 +114,7 @@ static const struct super_operations isofs_sops = { | |||
114 | }; | 114 | }; |
115 | 115 | ||
116 | 116 | ||
117 | static struct dentry_operations isofs_dentry_ops[] = { | 117 | static const struct dentry_operations isofs_dentry_ops[] = { |
118 | { | 118 | { |
119 | .d_hash = isofs_hash, | 119 | .d_hash = isofs_hash, |
120 | .d_compare = isofs_dentry_cmp, | 120 | .d_compare = isofs_dentry_cmp, |
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index 07e9715b8658..9c590722d87e 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c | |||
@@ -79,7 +79,7 @@ static int ncp_hash_dentry(struct dentry *, struct qstr *); | |||
79 | static int ncp_compare_dentry (struct dentry *, struct qstr *, struct qstr *); | 79 | static int ncp_compare_dentry (struct dentry *, struct qstr *, struct qstr *); |
80 | static int ncp_delete_dentry(struct dentry *); | 80 | static int ncp_delete_dentry(struct dentry *); |
81 | 81 | ||
82 | static struct dentry_operations ncp_dentry_operations = | 82 | static const struct dentry_operations ncp_dentry_operations = |
83 | { | 83 | { |
84 | .d_revalidate = ncp_lookup_validate, | 84 | .d_revalidate = ncp_lookup_validate, |
85 | .d_hash = ncp_hash_dentry, | 85 | .d_hash = ncp_hash_dentry, |
@@ -87,7 +87,7 @@ static struct dentry_operations ncp_dentry_operations = | |||
87 | .d_delete = ncp_delete_dentry, | 87 | .d_delete = ncp_delete_dentry, |
88 | }; | 88 | }; |
89 | 89 | ||
90 | struct dentry_operations ncp_root_dentry_operations = | 90 | const struct dentry_operations ncp_root_dentry_operations = |
91 | { | 91 | { |
92 | .d_hash = ncp_hash_dentry, | 92 | .d_hash = ncp_hash_dentry, |
93 | .d_compare = ncp_compare_dentry, | 93 | .d_compare = ncp_compare_dentry, |
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index ad92461cbfc3..ae881ccd2f03 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
@@ -1136,7 +1136,7 @@ xattr_lookup_poison(struct dentry *dentry, struct qstr *q1, struct qstr *name) | |||
1136 | return 1; | 1136 | return 1; |
1137 | } | 1137 | } |
1138 | 1138 | ||
1139 | static struct dentry_operations xattr_lookup_poison_ops = { | 1139 | static const struct dentry_operations xattr_lookup_poison_ops = { |
1140 | .d_compare = xattr_lookup_poison, | 1140 | .d_compare = xattr_lookup_poison, |
1141 | }; | 1141 | }; |
1142 | 1142 | ||
diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c index e7ddd0328ddc..3e4803b4427e 100644 --- a/fs/smbfs/dir.c +++ b/fs/smbfs/dir.c | |||
@@ -277,7 +277,7 @@ static int smb_hash_dentry(struct dentry *, struct qstr *); | |||
277 | static int smb_compare_dentry(struct dentry *, struct qstr *, struct qstr *); | 277 | static int smb_compare_dentry(struct dentry *, struct qstr *, struct qstr *); |
278 | static int smb_delete_dentry(struct dentry *); | 278 | static int smb_delete_dentry(struct dentry *); |
279 | 279 | ||
280 | static struct dentry_operations smbfs_dentry_operations = | 280 | static const struct dentry_operations smbfs_dentry_operations = |
281 | { | 281 | { |
282 | .d_revalidate = smb_lookup_validate, | 282 | .d_revalidate = smb_lookup_validate, |
283 | .d_hash = smb_hash_dentry, | 283 | .d_hash = smb_hash_dentry, |
@@ -285,7 +285,7 @@ static struct dentry_operations smbfs_dentry_operations = | |||
285 | .d_delete = smb_delete_dentry, | 285 | .d_delete = smb_delete_dentry, |
286 | }; | 286 | }; |
287 | 287 | ||
288 | static struct dentry_operations smbfs_dentry_operations_case = | 288 | static const struct dentry_operations smbfs_dentry_operations_case = |
289 | { | 289 | { |
290 | .d_revalidate = smb_lookup_validate, | 290 | .d_revalidate = smb_lookup_validate, |
291 | .d_delete = smb_delete_dentry, | 291 | .d_delete = smb_delete_dentry, |
diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c index a1f1ef33e81c..33e047b59b8d 100644 --- a/fs/sysv/namei.c +++ b/fs/sysv/namei.c | |||
@@ -38,7 +38,7 @@ static int sysv_hash(struct dentry *dentry, struct qstr *qstr) | |||
38 | return 0; | 38 | return 0; |
39 | } | 39 | } |
40 | 40 | ||
41 | struct dentry_operations sysv_dentry_operations = { | 41 | const struct dentry_operations sysv_dentry_operations = { |
42 | .d_hash = sysv_hash, | 42 | .d_hash = sysv_hash, |
43 | }; | 43 | }; |
44 | 44 | ||
diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h index 38ebe3f85b3d..5784a318c883 100644 --- a/fs/sysv/sysv.h +++ b/fs/sysv/sysv.h | |||
@@ -170,7 +170,7 @@ extern const struct file_operations sysv_file_operations; | |||
170 | extern const struct file_operations sysv_dir_operations; | 170 | extern const struct file_operations sysv_dir_operations; |
171 | extern const struct address_space_operations sysv_aops; | 171 | extern const struct address_space_operations sysv_aops; |
172 | extern const struct super_operations sysv_sops; | 172 | extern const struct super_operations sysv_sops; |
173 | extern struct dentry_operations sysv_dentry_operations; | 173 | extern const struct dentry_operations sysv_dentry_operations; |
174 | 174 | ||
175 | 175 | ||
176 | enum { | 176 | enum { |
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h index f69e66d151cc..30b06c893944 100644 --- a/include/linux/ncp_fs.h +++ b/include/linux/ncp_fs.h | |||
@@ -204,7 +204,7 @@ void ncp_update_inode2(struct inode *, struct ncp_entry_info *); | |||
204 | /* linux/fs/ncpfs/dir.c */ | 204 | /* linux/fs/ncpfs/dir.c */ |
205 | extern const struct inode_operations ncp_dir_inode_operations; | 205 | extern const struct inode_operations ncp_dir_inode_operations; |
206 | extern const struct file_operations ncp_dir_operations; | 206 | extern const struct file_operations ncp_dir_operations; |
207 | extern struct dentry_operations ncp_root_dentry_operations; | 207 | extern const struct dentry_operations ncp_root_dentry_operations; |
208 | int ncp_conn_logged_in(struct super_block *); | 208 | int ncp_conn_logged_in(struct super_block *); |
209 | int ncp_date_dos2unix(__le16 time, __le16 date); | 209 | int ncp_date_dos2unix(__le16 time, __le16 date); |
210 | void ncp_date_unix2dos(int unix_date, __le16 * time, __le16 * date); | 210 | void ncp_date_unix2dos(int unix_date, __le16 * time, __le16 * date); |