[git pull] fuse fix for 2.6.30 and -stable

[Miklos Szeredi]

Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git for-linus

to get the following fix.

Thanks,
Miklos

---
commit 5291658d87ac1ae60418e79e7b6bad7d5f595e0c
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Fri Mar 27 13:36:10 2009 +0300

    fuse: fix fuse_file_lseek returning with lock held
    
    This bug was found with smatch (http://repo.or.cz/w/smatch.git/).  If
    we return directly the inode->i_mutex lock doesn't get released.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
    CC: stable@xxxxxxxxxx
---
 fs/fuse/file.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index d9fdb7c..821d10f 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1465,7 +1465,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
 	case SEEK_END:
 		retval = fuse_update_attributes(inode, NULL, file, NULL);
 		if (retval)
-			return retval;
+			goto exit;
 		offset += i_size_read(inode);
 		break;
 	case SEEK_CUR:
@@ -1479,6 +1479,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
 		}
 		retval = offset;
 	}
+exit:
 	mutex_unlock(&inode->i_mutex);
 	return retval;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/