Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
860de071
Commit
860de071
authored
Jun 09, 2006
by
Trond Myklebust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NFS: Fix compile errors introduced by referrals patches
Signed-off-by:
Trond Myklebust
<
Trond.Myklebust@netapp.com
>
parent
87e4ba1a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
11 deletions
+26
-11
fs/nfs/inode.c
fs/nfs/inode.c
+26
-11
No files found.
fs/nfs/inode.c
View file @
860de071
...
@@ -2444,6 +2444,20 @@ static struct file_system_type clone_nfs4_fs_type = {
...
@@ -2444,6 +2444,20 @@ static struct file_system_type clone_nfs4_fs_type = {
.
fs_flags
=
FS_ODD_RENAME
|
FS_REVAL_DOT
|
FS_BINARY_MOUNTDATA
,
.
fs_flags
=
FS_ODD_RENAME
|
FS_REVAL_DOT
|
FS_BINARY_MOUNTDATA
,
};
};
static
struct
vfsmount
*
nfs_do_clone_mount
(
struct
nfs_server
*
server
,
char
*
devname
,
struct
nfs_clone_mount
*
mountdata
)
{
struct
vfsmount
*
mnt
=
NULL
;
switch
(
server
->
rpc_ops
->
version
)
{
case
2
:
case
3
:
mnt
=
vfs_kern_mount
(
&
clone_nfs_fs_type
,
0
,
devname
,
&
mountdata
);
break
;
case
4
:
mnt
=
vfs_kern_mount
(
&
clone_nfs4_fs_type
,
0
,
devname
,
mountdata
);
}
return
mnt
;
}
#define nfs4_init_once(nfsi) \
#define nfs4_init_once(nfsi) \
do { \
do { \
INIT_LIST_HEAD(&(nfsi)->open_states); \
INIT_LIST_HEAD(&(nfsi)->open_states); \
...
@@ -2477,6 +2491,10 @@ static inline void unregister_nfs4fs(void)
...
@@ -2477,6 +2491,10 @@ static inline void unregister_nfs4fs(void)
do { } while (0)
do { } while (0)
#define register_nfs4fs() (0)
#define register_nfs4fs() (0)
#define unregister_nfs4fs()
#define unregister_nfs4fs()
static
struct
vfsmount
*
nfs_do_clone_mount
(
struct
nfs_server
*
server
,
char
*
devname
,
struct
nfs_clone_mount
*
mountdata
)
{
return
vfs_kern_mount
(
&
clone_nfs_fs_type
,
0
,
devname
,
&
mountdata
);
}
#endif
#endif
static
inline
char
*
nfs_devname
(
const
struct
vfsmount
*
mnt_parent
,
static
inline
char
*
nfs_devname
(
const
struct
vfsmount
*
mnt_parent
,
...
@@ -2517,17 +2535,7 @@ struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
...
@@ -2517,17 +2535,7 @@ struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
mnt
=
(
struct
vfsmount
*
)
devname
;
mnt
=
(
struct
vfsmount
*
)
devname
;
if
(
IS_ERR
(
devname
))
if
(
IS_ERR
(
devname
))
goto
free_page
;
goto
free_page
;
switch
(
NFS_SB
(
mnt_parent
->
mnt_sb
)
->
rpc_ops
->
version
)
{
mnt
=
nfs_do_clone_mount
(
NFS_SB
(
mnt_parent
->
mnt_sb
),
devname
,
&
mountdata
);
case
2
:
case
3
:
mnt
=
vfs_kern_mount
(
&
clone_nfs_fs_type
,
0
,
devname
,
&
mountdata
);
break
;
case
4
:
mnt
=
vfs_kern_mount
(
&
clone_nfs4_fs_type
,
0
,
devname
,
&
mountdata
);
break
;
default:
BUG
();
}
free_page:
free_page:
free_page
((
unsigned
long
)
page
);
free_page
((
unsigned
long
)
page
);
out:
out:
...
@@ -2535,6 +2543,7 @@ out:
...
@@ -2535,6 +2543,7 @@ out:
return
mnt
;
return
mnt
;
}
}
#ifdef CONFIG_NFS_V4
/* Check if fs_root is valid */
/* Check if fs_root is valid */
static
inline
char
*
nfs4_pathname_string
(
struct
nfs4_pathname
*
pathname
,
char
*
buffer
,
ssize_t
buflen
)
static
inline
char
*
nfs4_pathname_string
(
struct
nfs4_pathname
*
pathname
,
char
*
buffer
,
ssize_t
buflen
)
{
{
...
@@ -2789,6 +2798,12 @@ out:
...
@@ -2789,6 +2798,12 @@ out:
dprintk
(
"%s: done
\n
"
,
__FUNCTION__
);
dprintk
(
"%s: done
\n
"
,
__FUNCTION__
);
return
mnt
;
return
mnt
;
}
}
#else
struct
vfsmount
*
nfs_do_refmount
(
const
struct
vfsmount
*
mnt_parent
,
struct
dentry
*
dentry
)
{
return
ERR_PTR
(
-
ENOENT
);
}
#endif
extern
int
nfs_init_nfspagecache
(
void
);
extern
int
nfs_init_nfspagecache
(
void
);
extern
void
nfs_destroy_nfspagecache
(
void
);
extern
void
nfs_destroy_nfspagecache
(
void
);
...
...
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