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
nexedi
linux
Commits
9216106a
Commit
9216106a
authored
Nov 19, 2012
by
Trond Myklebust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NFSv4.1: clean up nfs4_recall_slot to use nfs4_alloc_slots
Signed-off-by:
Trond Myklebust
<
Trond.Myklebust@netapp.com
>
parent
2d473d37
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
fs/nfs/nfs4_fs.h
fs/nfs/nfs4_fs.h
+2
-0
fs/nfs/nfs4proc.c
fs/nfs/nfs4proc.c
+1
-1
fs/nfs/nfs4state.c
fs/nfs/nfs4state.c
+1
-2
No files found.
fs/nfs/nfs4_fs.h
View file @
9216106a
...
@@ -258,6 +258,8 @@ extern int nfs4_proc_get_lease_time(struct nfs_client *clp,
...
@@ -258,6 +258,8 @@ extern int nfs4_proc_get_lease_time(struct nfs_client *clp,
extern
int
nfs4_proc_layoutcommit
(
struct
nfs4_layoutcommit_data
*
data
,
extern
int
nfs4_proc_layoutcommit
(
struct
nfs4_layoutcommit_data
*
data
,
bool
sync
);
bool
sync
);
extern
struct
nfs4_slot
*
nfs4_alloc_slots
(
u32
max_slots
,
gfp_t
gfp_flags
);
static
inline
bool
static
inline
bool
is_ds_only_client
(
struct
nfs_client
*
clp
)
is_ds_only_client
(
struct
nfs_client
*
clp
)
{
{
...
...
fs/nfs/nfs4proc.c
View file @
9216106a
...
@@ -5656,7 +5656,7 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo)
...
@@ -5656,7 +5656,7 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo)
return
status
;
return
status
;
}
}
st
atic
st
ruct
nfs4_slot
*
nfs4_alloc_slots
(
u32
max_slots
,
gfp_t
gfp_flags
)
struct
nfs4_slot
*
nfs4_alloc_slots
(
u32
max_slots
,
gfp_t
gfp_flags
)
{
{
return
kmalloc_array
(
max_slots
,
sizeof
(
struct
nfs4_slot
),
gfp_flags
);
return
kmalloc_array
(
max_slots
,
sizeof
(
struct
nfs4_slot
),
gfp_flags
);
}
}
...
...
fs/nfs/nfs4state.c
View file @
9216106a
...
@@ -2033,8 +2033,7 @@ static int nfs4_recall_slot(struct nfs_client *clp)
...
@@ -2033,8 +2033,7 @@ static int nfs4_recall_slot(struct nfs_client *clp)
return
0
;
return
0
;
nfs4_begin_drain_session
(
clp
);
nfs4_begin_drain_session
(
clp
);
fc_tbl
=
&
clp
->
cl_session
->
fc_slot_table
;
fc_tbl
=
&
clp
->
cl_session
->
fc_slot_table
;
new
=
kmalloc
(
fc_tbl
->
target_max_slots
*
sizeof
(
struct
nfs4_slot
),
new
=
nfs4_alloc_slots
(
fc_tbl
->
target_max_slots
,
GFP_NOFS
);
GFP_NOFS
);
if
(
!
new
)
if
(
!
new
)
return
-
ENOMEM
;
return
-
ENOMEM
;
...
...
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