diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 17:19:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 17:19:48 -0800 |
| commit | 1a4c6be4aca5ad6b300932efed1e2729fdc25af9 (patch) | |
| tree | 99f43fadbc0dc6c43d275d4c7fafd3b52cccb217 /fs/nfs/delegation.c | |
| parent | a62f735cbb1a0937ab6a9196dadf752694ef0b7f (diff) | |
| parent | 5216a8e70e25b01cbd2915cd0442fb96deb2c262 (diff) | |
Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
Wrap buffers used for rpc debug printks into RPC_IFDEBUG
nfs: fix sparse warnings
NFS: flush signals before taking down callback thread
Diffstat (limited to 'fs/nfs/delegation.c')
| -rw-r--r-- | fs/nfs/delegation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index b9eadd18ba7..00a5e4405e1 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -49,7 +49,7 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_ struct file_lock *fl; int status; - for (fl = inode->i_flock; fl != 0; fl = fl->fl_next) { + for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) { if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK))) continue; if (nfs_file_open_context(fl->fl_file) != ctx) |