Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
376282cd
Commit
376282cd
authored
May 20, 2004
by
Trond Myklebust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NFS: Patch by Steve Dickson to improve error reporting
when mounting an NFS filesystem.
parent
6da1abab
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
fs/nfs/inode.c
fs/nfs/inode.c
+10
-6
No files found.
fs/nfs/inode.c
View file @
376282cd
...
@@ -237,7 +237,7 @@ nfs_get_root(struct super_block *sb, struct nfs_fh *rootfh, struct nfs_fsinfo *f
...
@@ -237,7 +237,7 @@ nfs_get_root(struct super_block *sb, struct nfs_fh *rootfh, struct nfs_fsinfo *f
error
=
server
->
rpc_ops
->
getroot
(
server
,
rootfh
,
fsinfo
);
error
=
server
->
rpc_ops
->
getroot
(
server
,
rootfh
,
fsinfo
);
if
(
error
<
0
)
{
if
(
error
<
0
)
{
printk
(
KERN_NOTICE
"nfs_get_root: getattr error = %d
\n
"
,
-
error
);
dprintk
(
"nfs_get_root: getattr error = %d
\n
"
,
-
error
);
return
ERR_PTR
(
error
);
return
ERR_PTR
(
error
);
}
}
...
@@ -262,6 +262,7 @@ nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)
...
@@ -262,6 +262,7 @@ nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)
struct
nfs_pathconf
pathinfo
=
{
struct
nfs_pathconf
pathinfo
=
{
.
fattr
=
&
fattr
,
.
fattr
=
&
fattr
,
};
};
int
no_root_error
=
0
;
/* We probably want something more informative here */
/* We probably want something more informative here */
snprintf
(
sb
->
s_id
,
sizeof
(
sb
->
s_id
),
"%x:%x"
,
MAJOR
(
sb
->
s_dev
),
MINOR
(
sb
->
s_dev
));
snprintf
(
sb
->
s_id
,
sizeof
(
sb
->
s_id
),
"%x:%x"
,
MAJOR
(
sb
->
s_dev
),
MINOR
(
sb
->
s_dev
));
...
@@ -272,12 +273,15 @@ nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)
...
@@ -272,12 +273,15 @@ nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)
root_inode
=
nfs_get_root
(
sb
,
&
server
->
fh
,
&
fsinfo
);
root_inode
=
nfs_get_root
(
sb
,
&
server
->
fh
,
&
fsinfo
);
/* Did getting the root inode fail? */
/* Did getting the root inode fail? */
if
(
IS_ERR
(
root_inode
))
if
(
IS_ERR
(
root_inode
))
{
no_root_error
=
PTR_ERR
(
root_inode
);
goto
out_no_root
;
goto
out_no_root
;
}
sb
->
s_root
=
d_alloc_root
(
root_inode
);
sb
->
s_root
=
d_alloc_root
(
root_inode
);
if
(
!
sb
->
s_root
)
if
(
!
sb
->
s_root
)
{
no_root_error
=
-
ENOMEM
;
goto
out_no_root
;
goto
out_no_root
;
}
sb
->
s_root
->
d_op
=
server
->
rpc_ops
->
dentry_ops
;
sb
->
s_root
->
d_op
=
server
->
rpc_ops
->
dentry_ops
;
/* Get some general file system info */
/* Get some general file system info */
...
@@ -337,10 +341,10 @@ nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)
...
@@ -337,10 +341,10 @@ nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)
return
0
;
return
0
;
/* Yargs. It didn't work out. */
/* Yargs. It didn't work out. */
out_no_root:
out_no_root:
printk
(
"nfs_read_super: get root inode failed
\n
"
);
dprintk
(
"nfs_sb_init: get root inode failed: errno %d
\n
"
,
-
no_root_error
);
if
(
!
IS_ERR
(
root_inode
))
if
(
!
IS_ERR
(
root_inode
))
iput
(
root_inode
);
iput
(
root_inode
);
return
-
EINVAL
;
return
no_root_error
;
}
}
/*
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment