diff options
author | Nathan Scott | 2006-06-20 06:56:23 +0200 |
---|---|---|
committer | Nathan Scott | 2006-06-20 06:56:23 +0200 |
commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /fs/locks.c | |
parent | [XFS] Remove files from the build that are now unused. (diff) | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
download | kernel-qcow2-linux-98174e46974323e4941c72e46345f7277755e146.tar.gz kernel-qcow2-linux-98174e46974323e4941c72e46345f7277755e146.tar.xz kernel-qcow2-linux-98174e46974323e4941c72e46345f7277755e146.zip |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/locks.c b/fs/locks.c index 6f99c0a6f836..ab61a8b54829 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -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(); |