From 19a9883b5210e73d1801de07ecefd12d61383408 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 24 Dec 2009 06:49:47 -0500
Subject: [PATCH] --- yaml --- r: 185923 b: refs/heads/master c:
 9a66179e13504c676f891908a1e94912ec5cdefb h: refs/heads/master i:   185921:
 31fe39a30da74668fa4bb117f5b837610ef4722d   185919:
 4d33d18d42334ab768b0fb73d81f708e6582cace v: v3

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

diff --git a/[refs] b/[refs]
index 43eca78c8807..5eedb733e220 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2c36b450ee68470836cb858c58a6ba3a52c5ec5
+refs/heads/master: 9a66179e13504c676f891908a1e94912ec5cdefb
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 52517e0bbdde..5b9016006913 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1591,13 +1591,13 @@ static int open_will_truncate(int flag, struct inode *inode)
 }
 
 static struct file *finish_open(struct nameidata *nd,
-				int open_flag, int flag, int acc_mode)
+				int open_flag, int acc_mode)
 {
 	struct file *filp;
 	int will_truncate;
 	int error;
 
-	will_truncate = open_will_truncate(flag, nd->path.dentry->d_inode);
+	will_truncate = open_will_truncate(open_flag, nd->path.dentry->d_inode);
 	if (will_truncate) {
 		error = mnt_want_write(nd->path.mnt);
 		if (error)
@@ -1733,7 +1733,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
 	error = -EISDIR;
 	if (S_ISDIR(path->dentry->d_inode->i_mode))
 		goto exit;
-	filp = finish_open(nd, open_flag, flag, acc_mode);
+	filp = finish_open(nd, open_flag, acc_mode);
 	return filp;
 
 exit_mutex_unlock:
@@ -1854,7 +1854,7 @@ struct file *do_filp_open(int dfd, const char *pathname,
 	return filp;
 
 ok:
-	filp = finish_open(&nd, open_flag, flag, acc_mode);
+	filp = finish_open(&nd, open_flag, acc_mode);
 	if (nd.root.mnt)
 		path_put(&nd.root);
 	return filp;