projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a8203d
)
nfs: remove unnecessary check for NULL inode->i_flock from nfs_delegation_claim_locks
author
Jeff Layton
<jlayton@redhat.com>
Wed, 10 Apr 2013 19:36:48 +0000
(15:36 -0400)
committer
Trond Myklebust
<Trond.Myklebust@netapp.com>
Wed, 10 Apr 2013 19:40:31 +0000
(15:40 -0400)
The second check was added in commit
65b62a29
but it will never be true.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/delegation.c
patch
|
blob
|
history
diff --git
a/fs/nfs/delegation.c
b/fs/nfs/delegation.c
index
f30bd1e
..
57db324
100644
(file)
--- a/
fs/nfs/delegation.c
+++ b/
fs/nfs/delegation.c
@@
-71,10
+71,8
@@
static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_
int status = 0;
if (inode->i_flock == NULL)
- return 0;
-
- if (inode->i_flock == NULL)
goto out;
+
/* Protect inode->i_flock using the file locks lock */
lock_flocks();
for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {