d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixup a few style nits:

Browse Source 
- return error -> return (error);
  - move a declaration to the top of the function.
  - become bug for bug compatible with if (error) lines.

Submitted by: bde
This commit is contained in:
Andrew R. Reiter 2002-03-26 18:07:10 +00:00
parent c145dd8340
commit dcce8874eb
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/vfs_extattr.c
View File

@ -724,6 +724,7 @@ vfs_mount(td, fstype, fspath, fsflags, fsdata)
int error, flag = 0, flag2 = 0;
struct vattr va;
struct nameidata nd;
linker_file_t lf;
/*
* Be ultra-paranoid about making sure the type and fspath
@ -836,25 +837,23 @@ vfs_mount(td, fstype, fspath, fsflags, fsdata)
if (!strcmp(vfsp->vfc_name, fstype))
break;
if (vfsp == NULL) {
linker_file_t lf;
/* Only load modules for root (very important!) */
error = suser_td(td);
if (error) {
vput(vp);
return error;
return (error);
}
error = securelevel_gt(td->td_ucred, 0);
if (error != 0) {
if (error) {
vput(vp);
return (EPERM);
return (error);
}
error = linker_load_file(fstype, &lf);
if (error || lf == NULL) {
vput(vp);
if (lf == NULL)
error = ENODEV;
return error;
return (error);
}
lf->userrefs++;
/* lookup again, see if the VFS was loaded */

11
sys/kern/vfs_syscalls.c
View File

@ -724,6 +724,7 @@ vfs_mount(td, fstype, fspath, fsflags, fsdata)
int error, flag = 0, flag2 = 0;
struct vattr va;
struct nameidata nd;
linker_file_t lf;
/*
* Be ultra-paranoid about making sure the type and fspath
@ -836,25 +837,23 @@ vfs_mount(td, fstype, fspath, fsflags, fsdata)
if (!strcmp(vfsp->vfc_name, fstype))
break;
if (vfsp == NULL) {
linker_file_t lf;
/* Only load modules for root (very important!) */
error = suser_td(td);
if (error) {
vput(vp);
return error;
return (error);
}
error = securelevel_gt(td->td_ucred, 0);
if (error != 0) {
if (error) {
vput(vp);
return (EPERM);
return (error);
}
error = linker_load_file(fstype, &lf);
if (error || lf == NULL) {
vput(vp);
if (lf == NULL)
error = ENODEV;
return error;
return (error);
}
lf->userrefs++;
/* lookup again, see if the VFS was loaded */