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
1a81bb8a
Commit
1a81bb8a
authored
May 13, 2010
by
Trond Myklebust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NFS: Clean up nfs_access_zap_cache()
Signed-off-by:
Trond Myklebust
<
Trond.Myklebust@netapp.com
>
parent
61d5eb29
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
29 deletions
+31
-29
fs/nfs/dir.c
fs/nfs/dir.c
+31
-29
No files found.
fs/nfs/dir.c
View file @
1a81bb8a
...
...
@@ -1697,6 +1697,17 @@ static void nfs_access_free_entry(struct nfs_access_entry *entry)
smp_mb__after_atomic_dec
();
}
static
void
nfs_access_free_list
(
struct
list_head
*
head
)
{
struct
nfs_access_entry
*
cache
;
while
(
!
list_empty
(
head
))
{
cache
=
list_entry
(
head
->
next
,
struct
nfs_access_entry
,
lru
);
list_del
(
&
cache
->
lru
);
nfs_access_free_entry
(
cache
);
}
}
int
nfs_access_cache_shrinker
(
int
nr_to_scan
,
gfp_t
gfp_mask
)
{
LIST_HEAD
(
head
);
...
...
@@ -1743,52 +1754,41 @@ int nfs_access_cache_shrinker(int nr_to_scan, gfp_t gfp_mask)
goto
restart
;
}
spin_unlock
(
&
nfs_access_lru_lock
);
while
(
!
list_empty
(
&
head
))
{
cache
=
list_entry
(
head
.
next
,
struct
nfs_access_entry
,
lru
);
list_del
(
&
cache
->
lru
);
nfs_access_free_entry
(
cache
);
}
nfs_access_free_list
(
&
head
);
return
(
atomic_long_read
(
&
nfs_access_nr_entries
)
/
100
)
*
sysctl_vfs_cache_pressure
;
}
static
void
__nfs_access_zap_cache
(
struct
inode
*
inode
)
static
void
__nfs_access_zap_cache
(
struct
nfs_inode
*
nfsi
,
struct
list_head
*
head
)
{
struct
nfs_inode
*
nfsi
=
NFS_I
(
inode
);
struct
rb_root
*
root_node
=
&
nfsi
->
access_cache
;
struct
rb_node
*
n
,
*
dispose
=
NULL
;
struct
rb_node
*
n
;
struct
nfs_access_entry
*
entry
;
/* Unhook entries from the cache */
while
((
n
=
rb_first
(
root_node
))
!=
NULL
)
{
entry
=
rb_entry
(
n
,
struct
nfs_access_entry
,
rb_node
);
rb_erase
(
n
,
root_node
);
list_del
(
&
entry
->
lru
);
n
->
rb_left
=
dispose
;
dispose
=
n
;
list_move
(
&
entry
->
lru
,
head
);
}
nfsi
->
cache_validity
&=
~
NFS_INO_INVALID_ACCESS
;
spin_unlock
(
&
inode
->
i_lock
);
/* Now kill them all! */
while
(
dispose
!=
NULL
)
{
n
=
dispose
;
dispose
=
n
->
rb_left
;
nfs_access_free_entry
(
rb_entry
(
n
,
struct
nfs_access_entry
,
rb_node
));
}
}
void
nfs_access_zap_cache
(
struct
inode
*
inode
)
{
LIST_HEAD
(
head
);
if
(
test_bit
(
NFS_INO_ACL_LRU_SET
,
&
NFS_I
(
inode
)
->
flags
)
==
0
)
return
;
/* Remove from global LRU init */
if
(
test_and_clear_bit
(
NFS_INO_ACL_LRU_SET
,
&
NFS_I
(
inode
)
->
flags
))
{
spin_lock
(
&
nfs_access_lru_lock
);
if
(
test_and_clear_bit
(
NFS_INO_ACL_LRU_SET
,
&
NFS_I
(
inode
)
->
flags
))
list_del_init
(
&
NFS_I
(
inode
)
->
access_cache_inode_lru
);
spin_unlock
(
&
nfs_access_lru_lock
);
}
spin_lock
(
&
inode
->
i_lock
);
/* This will release the spinlock */
__nfs_access_zap_cache
(
inode
);
__nfs_access_zap_cache
(
NFS_I
(
inode
),
&
head
);
spin_unlock
(
&
inode
->
i_lock
);
spin_unlock
(
&
nfs_access_lru_lock
);
nfs_access_free_list
(
&
head
);
}
static
struct
nfs_access_entry
*
nfs_access_search_rbtree
(
struct
inode
*
inode
,
struct
rpc_cred
*
cred
)
...
...
@@ -1839,8 +1839,8 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str
nfs_access_free_entry
(
cache
);
return
-
ENOENT
;
out_zap:
/* This will release the spinlock */
__
nfs_access_zap_cache
(
inode
);
spin_unlock
(
&
inode
->
i_lock
);
nfs_access_zap_cache
(
inode
);
return
-
ENOENT
;
}
...
...
@@ -1895,9 +1895,11 @@ static void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *s
smp_mb__after_atomic_inc
();
/* Add inode to global LRU list */
if
(
!
test_
and_set_
bit
(
NFS_INO_ACL_LRU_SET
,
&
NFS_I
(
inode
)
->
flags
))
{
if
(
!
test_bit
(
NFS_INO_ACL_LRU_SET
,
&
NFS_I
(
inode
)
->
flags
))
{
spin_lock
(
&
nfs_access_lru_lock
);
list_add_tail
(
&
NFS_I
(
inode
)
->
access_cache_inode_lru
,
&
nfs_access_lru_list
);
if
(
!
test_and_set_bit
(
NFS_INO_ACL_LRU_SET
,
&
NFS_I
(
inode
)
->
flags
))
list_add_tail
(
&
NFS_I
(
inode
)
->
access_cache_inode_lru
,
&
nfs_access_lru_list
);
spin_unlock
(
&
nfs_access_lru_lock
);
}
}
...
...
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