diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 10:23:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 10:23:44 -0700 |
| commit | 27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0 (patch) | |
| tree | 25a8ca59a3743459bbd48674731becea89a16318 /net | |
| parent | f80a0ca6ad8f2800453e819dafa09a0ed9e56850 (diff) | |
| parent | 9699eda6bc1f708a28acb716e1477aa351362fe2 (diff) | |
| download | linux-3.10-27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0.tar.gz linux-3.10-27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0.tar.bz2 linux-3.10-27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0.zip | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
nfs: fix memory leak in nfs_get_sb with CONFIG_NFS_V4
nfs: fix some issues in nfs41_proc_reclaim_complete()
NFS: Ensure that nfs_wb_page() waits for Pg_writeback to clear
NFS: Fix an unstable write data integrity race
nfs: testing for null instead of ERR_PTR()
NFS: rsize and wsize settings ignored on v4 mounts
NFSv4: Don't attempt an atomic open if the file is a mountpoint
SUNRPC: Fix a bug in rpcauth_prune_expired
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/auth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index f394fc190a4..95afe79dd9d 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -237,7 +237,7 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan) list_for_each_entry_safe(cred, next, &cred_unused, cr_lru) { /* Enforce a 60 second garbage collection moratorium */ - if (time_in_range_open(cred->cr_expire, expired, jiffies) && + if (time_in_range(cred->cr_expire, expired, jiffies) && test_bit(RPCAUTH_CRED_HASHED, &cred->cr_flags) != 0) continue; |