From 1f62354070658e483fd3f38a52f4ec4bb472a10f Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Mon, 28 Nov 2005 13:44:14 -0800
Subject: [PATCH] --- yaml --- r: 14735 b: refs/heads/master c:
 154f484b92e5c25c400f6903512c511644a49322 h: refs/heads/master i:   14733:
 a10d198f4d55c54d036e545e68bff361d7357798   14731:
 6f05883d9b2598f542c36c50ee5fbd04ce198dc7   14727:
 352b017ec48199b92e05c05f48a2e235d68b9ac6   14719:
 029f64605acef7c73cfb46e4720171d0165a78af v: v3

---
 [refs]           | 2 +-
 trunk/fs/dquot.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0c7d7dc2c59f..f4f6faedabaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6aea114a728db9296f42102d4885e7fb035de0a9
+refs/heads/master: 154f484b92e5c25c400f6903512c511644a49322
diff --git a/trunk/fs/dquot.c b/trunk/fs/dquot.c
index 05b60283c9c2..2a62b3dc20ec 100644
--- a/trunk/fs/dquot.c
+++ b/trunk/fs/dquot.c
@@ -1513,10 +1513,16 @@ int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
 	if (IS_ERR(dentry))
 		return PTR_ERR(dentry);
 
+	if (!dentry->d_inode) {
+		error = -ENOENT;
+		goto out;
+	}
+
 	error = security_quota_on(dentry);
 	if (!error)
 		error = vfs_quota_on_inode(dentry->d_inode, type, format_id);
 
+out:
 	dput(dentry);
 	return error;
 }