lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFS: Add extra const qualifiers

Browse Source 
Add some extra const qualifiers into NFS.

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
David Howells
2006-08-22 20:06:11 -04:00
committed by Trond Myklebust
parent 0c7d90cfed
commit 509de81116
8 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfs/namespace.c
View File

@@ -172,7 +172,8 @@ void nfs_release_automount_timer(void)
/* /*
* Clone a mountpoint of the appropriate type * Clone a mountpoint of the appropriate type
*/ */
static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server, char *devname, static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server,
const char *devname,
struct nfs_clone_mount *mountdata) struct nfs_clone_mount *mountdata)
{ {
#ifdef CONFIG_NFS_V4 #ifdef CONFIG_NFS_V4

2
fs/nfs/nfs3proc.c
View File

@@ -886,7 +886,7 @@ nfs3_proc_lock(struct file *filp, int cmd, struct file_lock *fl)
return nlmclnt_proc(filp->f_dentry->d_inode, cmd, fl); return nlmclnt_proc(filp->f_dentry->d_inode, cmd, fl);
} }
struct nfs_rpc_ops nfs_v3_clientops = { const struct nfs_rpc_ops nfs_v3_clientops = {
.version = 3, /* protocol version */ .version = 3, /* protocol version */
.dentry_ops = &nfs_dentry_operations, .dentry_ops = &nfs_dentry_operations,
.dir_inode_ops = &nfs3_dir_inode_operations, .dir_inode_ops = &nfs3_dir_inode_operations,

8
fs/nfs/nfs4namespace.c
View File

@@ -23,7 +23,7 @@
/* /*
* Check if fs_root is valid * Check if fs_root is valid
*/ */
static inline char *nfs4_pathname_string(struct nfs4_pathname *pathname, static inline char *nfs4_pathname_string(const struct nfs4_pathname *pathname,
char *buffer, ssize_t buflen) char *buffer, ssize_t buflen)
{ {
char *end = buffer + buflen; char *end = buffer + buflen;
@@ -34,7 +34,7 @@ static inline char *nfs4_pathname_string(struct nfs4_pathname *pathname,
n = pathname->ncomponents; n = pathname->ncomponents;
while (--n >= 0) { while (--n >= 0) {
struct nfs4_string *component = &pathname->components[n]; const struct nfs4_string *component = &pathname->components[n];
buflen -= component->len + 1; buflen -= component->len + 1;
if (buflen < 0) if (buflen < 0)
goto Elong; goto Elong;
@@ -60,7 +60,7 @@ Elong:
*/ */
static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent, static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent,
const struct dentry *dentry, const struct dentry *dentry,
struct nfs4_fs_locations *locations) const struct nfs4_fs_locations *locations)
{ {
struct vfsmount *mnt = ERR_PTR(-ENOENT); struct vfsmount *mnt = ERR_PTR(-ENOENT);
struct nfs_clone_mount mountdata = { struct nfs_clone_mount mountdata = {
@@ -108,7 +108,7 @@ static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent,
loc = 0; loc = 0;
while (loc < locations->nlocations && IS_ERR(mnt)) { while (loc < locations->nlocations && IS_ERR(mnt)) {
struct nfs4_fs_location *location = &locations->locations[loc]; const struct nfs4_fs_location *location = &locations->locations[loc];
char *mnt_path; char *mnt_path;
if (location == NULL || location->nservers <= 0 || if (location == NULL || location->nservers <= 0 ||

2
fs/nfs/nfs4proc.c
View File

@@ -3761,7 +3761,7 @@ static struct inode_operations nfs4_file_inode_operations = {
.listxattr = nfs4_listxattr, .listxattr = nfs4_listxattr,
}; };
struct nfs_rpc_ops nfs_v4_clientops = { const struct nfs_rpc_ops nfs_v4_clientops = {
.version = 4, /* protocol version */ .version = 4, /* protocol version */
.dentry_ops = &nfs4_dentry_operations, .dentry_ops = &nfs4_dentry_operations,
.dir_inode_ops = &nfs4_dir_inode_operations, .dir_inode_ops = &nfs4_dir_inode_operations,

2
fs/nfs/proc.c
View File

@@ -671,7 +671,7 @@ nfs_proc_lock(struct file *filp, int cmd, struct file_lock *fl)
} }
struct nfs_rpc_ops nfs_v2_clientops = { const struct nfs_rpc_ops nfs_v2_clientops = {
.version = 2, /* protocol version */ .version = 2, /* protocol version */
.dentry_ops = &nfs_dentry_operations, .dentry_ops = &nfs_dentry_operations,
.dir_inode_ops = &nfs_dir_inode_operations, .dir_inode_ops = &nfs_dir_inode_operations,

10
fs/nfs/super.c
View File

@@ -329,10 +329,10 @@ static const char *nfs_pseudoflavour_to_name(rpc_authflavor_t flavour)
*/ */
static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss, int showdefaults) static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss, int showdefaults)
{ {
static struct proc_nfs_info { static const struct proc_nfs_info {
int flag; int flag;
char *str; const char *str;
char *nostr; const char *nostr;
} nfs_info[] = { } nfs_info[] = {
{ NFS_MOUNT_SOFT, ",soft", ",hard" }, { NFS_MOUNT_SOFT, ",soft", ",hard" },
{ NFS_MOUNT_INTR, ",intr", "" }, { NFS_MOUNT_INTR, ",intr", "" },
@@ -342,9 +342,9 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
{ NFS_MOUNT_NOACL, ",noacl", "" }, { NFS_MOUNT_NOACL, ",noacl", "" },
{ 0, NULL, NULL } { 0, NULL, NULL }
}; };
struct proc_nfs_info *nfs_infop; const struct proc_nfs_info *nfs_infop;
char buf[12]; char buf[12];
char *proto; const char *proto;
seq_printf(m, ",vers=%d", nfss->rpc_ops->version); seq_printf(m, ",vers=%d", nfss->rpc_ops->version);
seq_printf(m, ",rsize=%d", nfss->rsize); seq_printf(m, ",rsize=%d", nfss->rsize);

2
include/linux/nfs_fs_sb.h
View File

@@ -73,7 +73,7 @@ struct nfs_server {
struct rpc_clnt * client; /* RPC client handle */ struct rpc_clnt * client; /* RPC client handle */
struct rpc_clnt * client_sys; /* 2nd handle for FSINFO */ struct rpc_clnt * client_sys; /* 2nd handle for FSINFO */
struct rpc_clnt * client_acl; /* ACL RPC client handle */ struct rpc_clnt * client_acl; /* ACL RPC client handle */
struct nfs_rpc_ops * rpc_ops; /* NFS protocol vector */ const struct nfs_rpc_ops *rpc_ops; /* NFS protocol vector */
struct nfs_iostats * io_stats; /* I/O statistics */ struct nfs_iostats * io_stats; /* I/O statistics */
struct backing_dev_info backing_dev_info; struct backing_dev_info backing_dev_info;
int flags; /* various flags */ int flags; /* various flags */

6
include/linux/nfs_xdr.h
View File

@@ -833,9 +833,9 @@ struct nfs_rpc_ops {
/* /*
* Function vectors etc. for the NFS client * Function vectors etc. for the NFS client
*/ */
extern struct nfs_rpc_ops nfs_v2_clientops; extern const struct nfs_rpc_ops nfs_v2_clientops;
extern struct nfs_rpc_ops nfs_v3_clientops; extern const struct nfs_rpc_ops nfs_v3_clientops;
extern struct nfs_rpc_ops nfs_v4_clientops; extern const struct nfs_rpc_ops nfs_v4_clientops;
extern struct rpc_version nfs_version2; extern struct rpc_version nfs_version2;
extern struct rpc_version nfs_version3; extern struct rpc_version nfs_version3;
extern struct rpc_version nfs_version4; extern struct rpc_version nfs_version4;