diff options
author | Jeff Layton <jlayton@redhat.com> | 2012-08-06 11:00:27 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-08-20 18:39:42 -0400 |
commit | 1696c47ce2f42e671f6a17682b533273f4ac7963 (patch) | |
tree | a493213f46c77ea26891d2927bb125fa43f31b36 /fs/nfsd | |
parent | 0ee5c6d632324a4b278cb0b29eb8effce4c8a358 (diff) |
nfsd: trivial comment updates
locks.c doesn't use the BKL anymore and there is no fi_perfile field.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4state.c | 5 | ||||
-rw-r--r-- | fs/nfsd/state.h | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index cc894eda385a..566a9b75fa0e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -4151,11 +4151,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
4151 | file_lock.fl_end = last_byte_offset(lock->lk_offset, lock->lk_length); | 4151 | file_lock.fl_end = last_byte_offset(lock->lk_offset, lock->lk_length); |
4152 | nfs4_transform_lock_offset(&file_lock); | 4152 | nfs4_transform_lock_offset(&file_lock); |
4153 | 4153 | ||
4154 | /* | ||
4155 | * Try to lock the file in the VFS. | ||
4156 | * Note: locks.c uses the BKL to protect the inode's lock list. | ||
4157 | */ | ||
4158 | |||
4159 | err = vfs_lock_file(filp, F_SETLK, &file_lock, &conflock); | 4154 | err = vfs_lock_file(filp, F_SETLK, &file_lock, &conflock); |
4160 | switch (-err) { | 4155 | switch (-err) { |
4161 | case 0: /* success! */ | 4156 | case 0: /* success! */ |
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 22bd0a66c356..ec513fd4bae9 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h | |||
@@ -373,11 +373,7 @@ static inline struct nfs4_lockowner * lockowner(struct nfs4_stateowner *so) | |||
373 | return container_of(so, struct nfs4_lockowner, lo_owner); | 373 | return container_of(so, struct nfs4_lockowner, lo_owner); |
374 | } | 374 | } |
375 | 375 | ||
376 | /* | 376 | /* nfs4_file: a file opened by some number of (open) nfs4_stateowners. */ |
377 | * nfs4_file: a file opened by some number of (open) nfs4_stateowners. | ||
378 | * o fi_perfile list is used to search for conflicting | ||
379 | * share_acces, share_deny on the file. | ||
380 | */ | ||
381 | struct nfs4_file { | 377 | struct nfs4_file { |
382 | atomic_t fi_ref; | 378 | atomic_t fi_ref; |
383 | struct list_head fi_hash; /* hash by "struct inode *" */ | 379 | struct list_head fi_hash; /* hash by "struct inode *" */ |