aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2007-10-21 19:42:17 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-22 11:13:21 -0400
commit39655164405940d4818224a085e35420e2f97aed (patch)
tree6b019b3bc77eecac1731fe64e5c031790c2b5223
parentcfaea787c05822acbb4d8963baee5edd1cc0258f (diff)
exportfs: make struct export_operations const
Now that nfsd has stopped writing to the find_exported_dentry member we an mark the export_operations const Signed-off-by: Christoph Hellwig <hch@lst.de> Cc: Neil Brown <neilb@suse.de> Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: <linux-ext4@vger.kernel.org> Cc: Dave Kleikamp <shaggy@austin.ibm.com> Cc: Anton Altaparmakov <aia21@cantab.net> Cc: David Chinner <dgc@sgi.com> Cc: Timothy Shimmin <tes@sgi.com> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Cc: Hugh Dickins <hugh@veritas.com> Cc: Chris Mason <mason@suse.com> Cc: Jeff Mahoney <jeffm@suse.com> Cc: "Vladimir V. Saveliev" <vs@namesys.com> Cc: Steven Whitehouse <swhiteho@redhat.com> Cc: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/cifs/cifsfs.h2
-rw-r--r--fs/cifs/export.c2
-rw-r--r--fs/efs/super.c2
-rw-r--r--fs/exportfs/expfs.c6
-rw-r--r--fs/ext2/super.c2
-rw-r--r--fs/ext3/super.c2
-rw-r--r--fs/ext4/super.c2
-rw-r--r--fs/fat/inode.c2
-rw-r--r--fs/gfs2/ops_export.c2
-rw-r--r--fs/gfs2/ops_fstype.h2
-rw-r--r--fs/isofs/export.c2
-rw-r--r--fs/isofs/isofs.h2
-rw-r--r--fs/jfs/super.c4
-rw-r--r--fs/ntfs/namei.c2
-rw-r--r--fs/ntfs/ntfs.h2
-rw-r--r--fs/ocfs2/export.c2
-rw-r--r--fs/ocfs2/export.h2
-rw-r--r--fs/reiserfs/super.c2
-rw-r--r--fs/xfs/linux-2.6/xfs_export.c2
-rw-r--r--fs/xfs/linux-2.6/xfs_super.h2
-rw-r--r--include/linux/fs.h2
-rw-r--r--mm/shmem.c2
22 files changed, 25 insertions, 25 deletions
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 0a3ee5a322b0..5574ba3ab1f9 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -103,7 +103,7 @@ extern int cifs_ioctl(struct inode *inode, struct file *filep,
103 unsigned int command, unsigned long arg); 103 unsigned int command, unsigned long arg);
104 104
105#ifdef CONFIG_CIFS_EXPERIMENTAL 105#ifdef CONFIG_CIFS_EXPERIMENTAL
106extern struct export_operations cifs_export_ops; 106extern const struct export_operations cifs_export_ops;
107#endif /* EXPERIMENTAL */ 107#endif /* EXPERIMENTAL */
108 108
109#define CIFS_VERSION "1.51" 109#define CIFS_VERSION "1.51"
diff --git a/fs/cifs/export.c b/fs/cifs/export.c
index d614b91caeca..75949d6a5f1b 100644
--- a/fs/cifs/export.c
+++ b/fs/cifs/export.c
@@ -53,7 +53,7 @@ static struct dentry *cifs_get_parent(struct dentry *dentry)
53 return ERR_PTR(-EACCES); 53 return ERR_PTR(-EACCES);
54} 54}
55 55
56struct export_operations cifs_export_ops = { 56const struct export_operations cifs_export_ops = {
57 .get_parent = cifs_get_parent, 57 .get_parent = cifs_get_parent,
58/* Following five export operations are unneeded so far and can default: 58/* Following five export operations are unneeded so far and can default:
59 .get_dentry = 59 .get_dentry =
diff --git a/fs/efs/super.c b/fs/efs/super.c
index d8ce21b82fba..c79bc627f107 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -113,7 +113,7 @@ static const struct super_operations efs_superblock_operations = {
113 .remount_fs = efs_remount, 113 .remount_fs = efs_remount,
114}; 114};
115 115
116static struct export_operations efs_export_ops = { 116static const struct export_operations efs_export_ops = {
117 .fh_to_dentry = efs_fh_to_dentry, 117 .fh_to_dentry = efs_fh_to_dentry,
118 .fh_to_parent = efs_fh_to_parent, 118 .fh_to_parent = efs_fh_to_parent,
119 .get_parent = efs_get_parent, 119 .get_parent = efs_get_parent,
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c
index e68f0279f4b0..352465312398 100644
--- a/fs/exportfs/expfs.c
+++ b/fs/exportfs/expfs.c
@@ -16,7 +16,7 @@ static int get_name(struct dentry *dentry, char *name,
16static int exportfs_get_name(struct dentry *dir, char *name, 16static int exportfs_get_name(struct dentry *dir, char *name,
17 struct dentry *child) 17 struct dentry *child)
18{ 18{
19 struct export_operations *nop = dir->d_sb->s_export_op; 19 const struct export_operations *nop = dir->d_sb->s_export_op;
20 20
21 if (nop->get_name) 21 if (nop->get_name)
22 return nop->get_name(dir, name, child); 22 return nop->get_name(dir, name, child);
@@ -333,7 +333,7 @@ static int export_encode_fh(struct dentry *dentry, struct fid *fid,
333int exportfs_encode_fh(struct dentry *dentry, struct fid *fid, int *max_len, 333int exportfs_encode_fh(struct dentry *dentry, struct fid *fid, int *max_len,
334 int connectable) 334 int connectable)
335{ 335{
336 struct export_operations *nop = dentry->d_sb->s_export_op; 336 const struct export_operations *nop = dentry->d_sb->s_export_op;
337 int error; 337 int error;
338 338
339 if (nop->encode_fh) 339 if (nop->encode_fh)
@@ -349,7 +349,7 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,
349 int fh_len, int fileid_type, 349 int fh_len, int fileid_type,
350 int (*acceptable)(void *, struct dentry *), void *context) 350 int (*acceptable)(void *, struct dentry *), void *context)
351{ 351{
352 struct export_operations *nop = mnt->mnt_sb->s_export_op; 352 const struct export_operations *nop = mnt->mnt_sb->s_export_op;
353 struct dentry *result, *alias; 353 struct dentry *result, *alias;
354 int err; 354 int err;
355 355
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 4a03d0c84df2..154e25f13d77 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -357,7 +357,7 @@ static struct dentry *ext2_fh_to_parent(struct super_block *sb, struct fid *fid,
357 * systems, but can be improved upon. 357 * systems, but can be improved upon.
358 * Currently only get_parent is required. 358 * Currently only get_parent is required.
359 */ 359 */
360static struct export_operations ext2_export_ops = { 360static const struct export_operations ext2_export_ops = {
361 .fh_to_dentry = ext2_fh_to_dentry, 361 .fh_to_dentry = ext2_fh_to_dentry,
362 .fh_to_parent = ext2_fh_to_parent, 362 .fh_to_parent = ext2_fh_to_parent,
363 .get_parent = ext2_get_parent, 363 .get_parent = ext2_get_parent,
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 6a66f3d02b75..de55da9e28ba 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -741,7 +741,7 @@ static const struct super_operations ext3_sops = {
741#endif 741#endif
742}; 742};
743 743
744static struct export_operations ext3_export_ops = { 744static const struct export_operations ext3_export_ops = {
745 .fh_to_dentry = ext3_fh_to_dentry, 745 .fh_to_dentry = ext3_fh_to_dentry,
746 .fh_to_parent = ext3_fh_to_parent, 746 .fh_to_parent = ext3_fh_to_parent,
747 .get_parent = ext3_get_parent, 747 .get_parent = ext3_get_parent,
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 9f0d37a4c4df..8031dc0e24e5 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -796,7 +796,7 @@ static const struct super_operations ext4_sops = {
796#endif 796#endif
797}; 797};
798 798
799static struct export_operations ext4_export_ops = { 799static const struct export_operations ext4_export_ops = {
800 .fh_to_dentry = ext4_fh_to_dentry, 800 .fh_to_dentry = ext4_fh_to_dentry,
801 .fh_to_parent = ext4_fh_to_parent, 801 .fh_to_parent = ext4_fh_to_parent,
802 .get_parent = ext4_get_parent, 802 .get_parent = ext4_get_parent,
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 14d75fcaf2b7..920a576e1c25 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -774,7 +774,7 @@ out:
774 return parent; 774 return parent;
775} 775}
776 776
777static struct export_operations fat_export_ops = { 777static const struct export_operations fat_export_ops = {
778 .encode_fh = fat_encode_fh, 778 .encode_fh = fat_encode_fh,
779 .fh_to_dentry = fat_fh_to_dentry, 779 .fh_to_dentry = fat_fh_to_dentry,
780 .get_parent = fat_get_parent, 780 .get_parent = fat_get_parent,
diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c
index c291005ec592..b9da62348a87 100644
--- a/fs/gfs2/ops_export.c
+++ b/fs/gfs2/ops_export.c
@@ -294,7 +294,7 @@ static struct dentry *gfs2_fh_to_parent(struct super_block *sb, struct fid *fid,
294 } 294 }
295} 295}
296 296
297struct export_operations gfs2_export_ops = { 297const struct export_operations gfs2_export_ops = {
298 .encode_fh = gfs2_encode_fh, 298 .encode_fh = gfs2_encode_fh,
299 .fh_to_dentry = gfs2_fh_to_dentry, 299 .fh_to_dentry = gfs2_fh_to_dentry,
300 .fh_to_parent = gfs2_fh_to_parent, 300 .fh_to_parent = gfs2_fh_to_parent,
diff --git a/fs/gfs2/ops_fstype.h b/fs/gfs2/ops_fstype.h
index 407029b3b2b3..da8490511836 100644
--- a/fs/gfs2/ops_fstype.h
+++ b/fs/gfs2/ops_fstype.h
@@ -14,6 +14,6 @@
14 14
15extern struct file_system_type gfs2_fs_type; 15extern struct file_system_type gfs2_fs_type;
16extern struct file_system_type gfs2meta_fs_type; 16extern struct file_system_type gfs2meta_fs_type;
17extern struct export_operations gfs2_export_ops; 17extern const struct export_operations gfs2_export_ops;
18 18
19#endif /* __OPS_FSTYPE_DOT_H__ */ 19#endif /* __OPS_FSTYPE_DOT_H__ */
diff --git a/fs/isofs/export.c b/fs/isofs/export.c
index 511c3513433f..29f9753ae5e5 100644
--- a/fs/isofs/export.c
+++ b/fs/isofs/export.c
@@ -207,7 +207,7 @@ static struct dentry *isofs_fh_to_parent(struct super_block *sb,
207 fh_len > 4 ? ifid->parent_generation : 0); 207 fh_len > 4 ? ifid->parent_generation : 0);
208} 208}
209 209
210struct export_operations isofs_export_ops = { 210const struct export_operations isofs_export_ops = {
211 .encode_fh = isofs_export_encode_fh, 211 .encode_fh = isofs_export_encode_fh,
212 .fh_to_dentry = isofs_fh_to_dentry, 212 .fh_to_dentry = isofs_fh_to_dentry,
213 .fh_to_parent = isofs_fh_to_parent, 213 .fh_to_parent = isofs_fh_to_parent,
diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h
index a07e67b1ea7f..f3213f9f89af 100644
--- a/fs/isofs/isofs.h
+++ b/fs/isofs/isofs.h
@@ -178,4 +178,4 @@ isofs_normalize_block_and_offset(struct iso_directory_record* de,
178extern const struct inode_operations isofs_dir_inode_operations; 178extern const struct inode_operations isofs_dir_inode_operations;
179extern const struct file_operations isofs_dir_operations; 179extern const struct file_operations isofs_dir_operations;
180extern const struct address_space_operations isofs_symlink_aops; 180extern const struct address_space_operations isofs_symlink_aops;
181extern struct export_operations isofs_export_ops; 181extern const struct export_operations isofs_export_ops;
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 81c3228ca455..314bb4ff1ba8 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -48,7 +48,7 @@ MODULE_LICENSE("GPL");
48static struct kmem_cache * jfs_inode_cachep; 48static struct kmem_cache * jfs_inode_cachep;
49 49
50static const struct super_operations jfs_super_operations; 50static const struct super_operations jfs_super_operations;
51static struct export_operations jfs_export_operations; 51static const struct export_operations jfs_export_operations;
52static struct file_system_type jfs_fs_type; 52static struct file_system_type jfs_fs_type;
53 53
54#define MAX_COMMIT_THREADS 64 54#define MAX_COMMIT_THREADS 64
@@ -737,7 +737,7 @@ static const struct super_operations jfs_super_operations = {
737#endif 737#endif
738}; 738};
739 739
740static struct export_operations jfs_export_operations = { 740static const struct export_operations jfs_export_operations = {
741 .fh_to_dentry = jfs_fh_to_dentry, 741 .fh_to_dentry = jfs_fh_to_dentry,
742 .fh_to_parent = jfs_fh_to_parent, 742 .fh_to_parent = jfs_fh_to_parent,
743 .get_parent = jfs_get_parent, 743 .get_parent = jfs_get_parent,
diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c
index 887c5e131093..e1781c8b1650 100644
--- a/fs/ntfs/namei.c
+++ b/fs/ntfs/namei.c
@@ -499,7 +499,7 @@ static struct dentry *ntfs_fh_to_parent(struct super_block *sb, struct fid *fid,
499 * allowing the inode number 0 which is used in NTFS for the system file $MFT 499 * allowing the inode number 0 which is used in NTFS for the system file $MFT
500 * and due to using iget() whereas NTFS needs ntfs_iget(). 500 * and due to using iget() whereas NTFS needs ntfs_iget().
501 */ 501 */
502struct export_operations ntfs_export_ops = { 502const struct export_operations ntfs_export_ops = {
503 .get_parent = ntfs_get_parent, /* Find the parent of a given 503 .get_parent = ntfs_get_parent, /* Find the parent of a given
504 directory. */ 504 directory. */
505 .fh_to_dentry = ntfs_fh_to_dentry, 505 .fh_to_dentry = ntfs_fh_to_dentry,
diff --git a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h
index d73f5a9ac341..d6a340bf80fc 100644
--- a/fs/ntfs/ntfs.h
+++ b/fs/ntfs/ntfs.h
@@ -69,7 +69,7 @@ extern const struct inode_operations ntfs_dir_inode_ops;
69extern const struct file_operations ntfs_empty_file_ops; 69extern const struct file_operations ntfs_empty_file_ops;
70extern const struct inode_operations ntfs_empty_inode_ops; 70extern const struct inode_operations ntfs_empty_inode_ops;
71 71
72extern struct export_operations ntfs_export_ops; 72extern const struct export_operations ntfs_export_ops;
73 73
74/** 74/**
75 * NTFS_SB - return the ntfs volume given a vfs super block 75 * NTFS_SB - return the ntfs volume given a vfs super block
diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c
index 3ad83e34dd39..535bfa9568a4 100644
--- a/fs/ocfs2/export.c
+++ b/fs/ocfs2/export.c
@@ -222,7 +222,7 @@ static struct dentry *ocfs2_fh_to_parent(struct super_block *sb,
222 return ocfs2_get_dentry(sb, &parent); 222 return ocfs2_get_dentry(sb, &parent);
223} 223}
224 224
225struct export_operations ocfs2_export_ops = { 225const struct export_operations ocfs2_export_ops = {
226 .encode_fh = ocfs2_encode_fh, 226 .encode_fh = ocfs2_encode_fh,
227 .fh_to_dentry = ocfs2_fh_to_dentry, 227 .fh_to_dentry = ocfs2_fh_to_dentry,
228 .fh_to_parent = ocfs2_fh_to_parent, 228 .fh_to_parent = ocfs2_fh_to_parent,
diff --git a/fs/ocfs2/export.h b/fs/ocfs2/export.h
index e08bed9e45a0..41a738678c37 100644
--- a/fs/ocfs2/export.h
+++ b/fs/ocfs2/export.h
@@ -28,6 +28,6 @@
28 28
29#include <linux/exportfs.h> 29#include <linux/exportfs.h>
30 30
31extern struct export_operations ocfs2_export_ops; 31extern const struct export_operations ocfs2_export_ops;
32 32
33#endif /* OCFS2_EXPORT_H */ 33#endif /* OCFS2_EXPORT_H */
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 708269f75206..5cd85fe5df5d 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -661,7 +661,7 @@ static struct quotactl_ops reiserfs_qctl_operations = {
661}; 661};
662#endif 662#endif
663 663
664static struct export_operations reiserfs_export_ops = { 664static const struct export_operations reiserfs_export_ops = {
665 .encode_fh = reiserfs_encode_fh, 665 .encode_fh = reiserfs_encode_fh,
666 .fh_to_dentry = reiserfs_fh_to_dentry, 666 .fh_to_dentry = reiserfs_fh_to_dentry,
667 .fh_to_parent = reiserfs_fh_to_parent, 667 .fh_to_parent = reiserfs_fh_to_parent,
diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
index 7178d61f002e..15bd4948832c 100644
--- a/fs/xfs/linux-2.6/xfs_export.c
+++ b/fs/xfs/linux-2.6/xfs_export.c
@@ -220,7 +220,7 @@ xfs_fs_get_parent(
220 return parent; 220 return parent;
221} 221}
222 222
223struct export_operations xfs_export_operations = { 223const struct export_operations xfs_export_operations = {
224 .encode_fh = xfs_fs_encode_fh, 224 .encode_fh = xfs_fs_encode_fh,
225 .fh_to_dentry = xfs_fs_fh_to_dentry, 225 .fh_to_dentry = xfs_fs_fh_to_dentry,
226 .fh_to_parent = xfs_fs_fh_to_parent, 226 .fh_to_parent = xfs_fs_fh_to_parent,
diff --git a/fs/xfs/linux-2.6/xfs_super.h b/fs/xfs/linux-2.6/xfs_super.h
index c78c23310fe8..3efcf45b14ab 100644
--- a/fs/xfs/linux-2.6/xfs_super.h
+++ b/fs/xfs/linux-2.6/xfs_super.h
@@ -118,7 +118,7 @@ extern int xfs_blkdev_get(struct xfs_mount *, const char *,
118extern void xfs_blkdev_put(struct block_device *); 118extern void xfs_blkdev_put(struct block_device *);
119extern void xfs_blkdev_issue_flush(struct xfs_buftarg *); 119extern void xfs_blkdev_issue_flush(struct xfs_buftarg *);
120 120
121extern struct export_operations xfs_export_operations; 121extern const struct export_operations xfs_export_operations;
122 122
123#define XFS_M(sb) ((struct xfs_mount *)((sb)->s_fs_info)) 123#define XFS_M(sb) ((struct xfs_mount *)((sb)->s_fs_info))
124 124
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 50078bb30a1c..b3ec4a496d64 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -987,7 +987,7 @@ struct super_block {
987 const struct super_operations *s_op; 987 const struct super_operations *s_op;
988 struct dquot_operations *dq_op; 988 struct dquot_operations *dq_op;
989 struct quotactl_ops *s_qcop; 989 struct quotactl_ops *s_qcop;
990 struct export_operations *s_export_op; 990 const struct export_operations *s_export_op;
991 unsigned long s_flags; 991 unsigned long s_flags;
992 unsigned long s_magic; 992 unsigned long s_magic;
993 struct dentry *s_root; 993 struct dentry *s_root;
diff --git a/mm/shmem.c b/mm/shmem.c
index 9dd219e6e059..404e53bb2127 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2071,7 +2071,7 @@ static int shmem_encode_fh(struct dentry *dentry, __u32 *fh, int *len,
2071 return 1; 2071 return 1;
2072} 2072}
2073 2073
2074static struct export_operations shmem_export_ops = { 2074static const struct export_operations shmem_export_ops = {
2075 .get_parent = shmem_get_parent, 2075 .get_parent = shmem_get_parent,
2076 .encode_fh = shmem_encode_fh, 2076 .encode_fh = shmem_encode_fh,
2077 .fh_to_dentry = shmem_fh_to_dentry, 2077 .fh_to_dentry = shmem_fh_to_dentry,