diff options
| author | David M. Richter <richterd@citi.umich.edu> | 2008-04-23 16:29:01 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-04-25 12:58:22 -0400 |
| commit | 190855576743a510219fc67886dace29b825d8cb (patch) | |
| tree | f31c569aa43b5e000610e81546fce13fecf894d8 | |
| parent | 288b2fd8251cb0bcb14b8a93755ef9c78de70e0f (diff) | |
| download | linux-3.10-190855576743a510219fc67886dace29b825d8cb.tar.gz linux-3.10-190855576743a510219fc67886dace29b825d8cb.tar.bz2 linux-3.10-190855576743a510219fc67886dace29b825d8cb.zip | |
leases: move lock allocation earlier in generic_setlease()
In generic_setlease(), the struct file_lock is allocated after tests for the
presence of conflicting readers/writers is done, despite the fact that the
allocation might block; this patch moves the allocation earlier. A subsequent
set of patches will rely on this behavior to properly serialize between a
modified __break_lease() and generic_setlease().
Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| -rw-r--r-- | fs/locks.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/locks.c b/fs/locks.c index da1d0ddb4ab..6a132cd4fa5 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1368,6 +1368,11 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) lease = *flp; if (arg != F_UNLCK) { + error = -ENOMEM; + new_fl = locks_alloc_lock(); + if (new_fl == NULL) + goto out; + error = -EAGAIN; if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) goto out; @@ -1375,11 +1380,6 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) && ((atomic_read(&dentry->d_count) > 1) || (atomic_read(&inode->i_count) > 1))) goto out; - - error = -ENOMEM; - new_fl = locks_alloc_lock(); - if (new_fl == NULL) - goto out; } /* |