aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-03-30 09:41:25 +0000
committerEric Van Hensbergen <ericvh@gmail.com>2010-04-05 14:32:33 -0500
commit85a770a8889035625466a4cfb1393cd7d2ffd165 (patch)
treea860f3d7a95ad083863a1b55394f31f3b1b6f133
parent11e9b49b7fa056bfc00a56de8956d1d5fe8b84ea (diff)
downloadkernel_goldelico_gta04-85a770a8889035625466a4cfb1393cd7d2ffd165.zip
kernel_goldelico_gta04-85a770a8889035625466a4cfb1393cd7d2ffd165.tar.gz
kernel_goldelico_gta04-85a770a8889035625466a4cfb1393cd7d2ffd165.tar.bz2
9p: return on mutex_lock_interruptible()
If "err" is -EINTR here the original code calls mutex_unlock() and then returns, but it should just return directly. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com> ------------------------------------------------------------------------------ Download Intel&#174; Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev
-rw-r--r--fs/9p/vfs_dir.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c
index d8a3afe..bbe00cf 100644
--- a/fs/9p/vfs_dir.c
+++ b/fs/9p/vfs_dir.c
@@ -130,6 +130,8 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir)
rdir = (struct p9_rdir *) fid->rdir;
err = mutex_lock_interruptible(&rdir->mutex);
+ if (err)
+ return err;
while (err == 0) {
if (rdir->tail == rdir->head) {
err = v9fs_file_readn(filp, rdir->buf, NULL,