diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-20 20:36:38 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-20 20:36:38 +0000 |
| commit | 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch) | |
| tree | c2f02ee30609d0d69308b4ca80d68d02a5f85552 /fs/locks.c | |
| parent | 0fd1ffe0633b4b039b343b753598e6df435e034d (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
| download | op-kernel-dev-75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d.zip op-kernel-dev-75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d.tar.gz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -755,6 +755,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request) if (request->fl_type == F_UNLCK) goto out; + error = -ENOMEM; new_fl = locks_alloc_lock(); if (new_fl == NULL) goto out; @@ -781,6 +782,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request) locks_copy_lock(new_fl, request); locks_insert_lock(&inode->i_flock, new_fl); new_fl = NULL; + error = 0; out: unlock_kernel(); |
