aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-12-23 15:21:34 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-12-23 15:21:34 -0500
commit7b5d2b98e118716dd1ccc2808fae88f6c4b16d54 (patch)
tree44039c03d8f47cd0bdcddcaf907c4b4caeb7fa1b /fs
parentdf94f000c46c055cf439f5b92807cd827557ffbc (diff)
NFS: rename nfs_path variable
Clean up: I'm about to move the declaration of nfs_mount into fs/nfs/internal.h and include it in fs/nfs/nfsroot.c. There's a conflicting definition of nfs_path in fs/nfs/internal.h and fs/nfs/nfsroot.c, so rename the private one. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfsroot.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index 8478fc25daee..f1c0a066439f 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -100,7 +100,7 @@ static char nfs_root_name[256] __initdata = "";
100static __be32 servaddr __initdata = 0; 100static __be32 servaddr __initdata = 0;
101 101
102/* Name of directory to mount */ 102/* Name of directory to mount */
103static char nfs_path[NFS_MAXPATHLEN] __initdata = { 0, }; 103static char nfs_export_path[NFS_MAXPATHLEN] __initdata = { 0, };
104 104
105/* NFS-related data */ 105/* NFS-related data */
106static struct nfs_mount_data nfs_data __initdata = { 0, };/* NFS mount info */ 106static struct nfs_mount_data nfs_data __initdata = { 0, };/* NFS mount info */
@@ -312,7 +312,7 @@ static int __init root_nfs_name(char *name)
312 printk(KERN_ERR "Root-NFS: Pathname for remote directory too long.\n"); 312 printk(KERN_ERR "Root-NFS: Pathname for remote directory too long.\n");
313 return -1; 313 return -1;
314 } 314 }
315 sprintf(nfs_path, buf, cp); 315 sprintf(nfs_export_path, buf, cp);
316 316
317 return 1; 317 return 1;
318} 318}
@@ -340,7 +340,7 @@ static int __init root_nfs_addr(void)
340static void __init root_nfs_print(void) 340static void __init root_nfs_print(void)
341{ 341{
342 printk(KERN_NOTICE "Root-NFS: Mounting %s on server %s as root\n", 342 printk(KERN_NOTICE "Root-NFS: Mounting %s on server %s as root\n",
343 nfs_path, nfs_data.hostname); 343 nfs_export_path, nfs_data.hostname);
344 printk(KERN_NOTICE "Root-NFS: rsize = %d, wsize = %d, timeo = %d, retrans = %d\n", 344 printk(KERN_NOTICE "Root-NFS: rsize = %d, wsize = %d, timeo = %d, retrans = %d\n",
345 nfs_data.rsize, nfs_data.wsize, nfs_data.timeo, nfs_data.retrans); 345 nfs_data.rsize, nfs_data.wsize, nfs_data.timeo, nfs_data.retrans);
346 printk(KERN_NOTICE "Root-NFS: acreg (min,max) = (%d,%d), acdir (min,max) = (%d,%d)\n", 346 printk(KERN_NOTICE "Root-NFS: acreg (min,max) = (%d,%d), acdir (min,max) = (%d,%d)\n",
@@ -493,10 +493,10 @@ static int __init root_nfs_get_handle(void)
493 493
494 set_sockaddr(&sin, servaddr, htons(mount_port)); 494 set_sockaddr(&sin, servaddr, htons(mount_port));
495 status = nfs_mount((struct sockaddr *) &sin, sizeof(sin), NULL, 495 status = nfs_mount((struct sockaddr *) &sin, sizeof(sin), NULL,
496 nfs_path, version, protocol, &fh); 496 nfs_export_path, version, protocol, &fh);
497 if (status < 0) 497 if (status < 0)
498 printk(KERN_ERR "Root-NFS: Server returned error %d " 498 printk(KERN_ERR "Root-NFS: Server returned error %d "
499 "while mounting %s\n", status, nfs_path); 499 "while mounting %s\n", status, nfs_export_path);
500 else { 500 else {
501 nfs_data.root.size = fh.size; 501 nfs_data.root.size = fh.size;
502 memcpy(nfs_data.root.data, fh.data, fh.size); 502 memcpy(nfs_data.root.data, fh.data, fh.size);