leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfs: use proc_create to setup de->proc_fops

Browse Source 
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Denis V. Lunev 2008-04-29 01:02:07 -07:00 committed by Linus Torvalds
parent 9ef2db2630
commit 34b37235c6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfs/client.c
View File

@ -1321,6 +1321,7 @@ static const struct file_operations nfs_server_list_fops = {
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release, .release = seq_release,
.owner = THIS_MODULE,
}; };
static int nfs_volume_list_open(struct inode *inode, struct file *file); static int nfs_volume_list_open(struct inode *inode, struct file *file);
@ -1341,6 +1342,7 @@ static const struct file_operations nfs_volume_list_fops = {
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release, .release = seq_release,
.owner = THIS_MODULE,
}; };
/* /*
@ -1507,20 +1509,16 @@ int __init nfs_fs_proc_init(void)
proc_fs_nfs->owner = THIS_MODULE; proc_fs_nfs->owner = THIS_MODULE;
/* a file of servers with which we're dealing */ /* a file of servers with which we're dealing */
p = create_proc_entry("servers", S_IFREG|S_IRUGO, proc_fs_nfs); p = proc_create("servers", S_IFREG|S_IRUGO,
proc_fs_nfs, &nfs_server_list_fops);
if (!p) if (!p)
goto error_1; goto error_1;
p->proc_fops = &nfs_server_list_fops;
p->owner = THIS_MODULE;
/* a file of volumes that we have mounted */ /* a file of volumes that we have mounted */
p = create_proc_entry("volumes", S_IFREG|S_IRUGO, proc_fs_nfs); p = proc_create("volumes", S_IFREG|S_IRUGO,
proc_fs_nfs, &nfs_volume_list_fops);
if (!p) if (!p)
goto error_2; goto error_2;
p->proc_fops = &nfs_volume_list_fops;
p->owner = THIS_MODULE;
return 0; return 0;
error_2: error_2: