From a0ac0f8a0d110403fa76dd6bce895864f2074e37 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 23 Jun 2012 22:49:45 +0400
Subject: [PATCH] --- yaml --- r: 312936 b: refs/heads/master c:
 c3c4f69424db0760239762d36d0b1b6ae524008b h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/fs/open.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cc605774b4e2..1d8448839f9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85d7d618c17a09cfd824c1ad4483c19e6f9637ff
+refs/heads/master: c3c4f69424db0760239762d36d0b1b6ae524008b
diff --git a/trunk/fs/open.c b/trunk/fs/open.c
index 124ccb1d38a0..764cc9c201a5 100644
--- a/trunk/fs/open.c
+++ b/trunk/fs/open.c
@@ -727,6 +727,7 @@ static int do_dentry_open(struct file *f,
 
 cleanup_all:
 	fops_put(f->f_op);
+	file_sb_list_del(f);
 	if (f->f_mode & FMODE_WRITE) {
 		put_write_access(inode);
 		if (!special_file(inode->i_mode)) {
@@ -740,7 +741,6 @@ static int do_dentry_open(struct file *f,
 			mnt_drop_write(f->f_path.mnt);
 		}
 	}
-	file_sb_list_del(f);
 cleanup_file:
 	path_put(&f->f_path);
 	f->f_path.mnt = NULL;