vfs: pass struct file to do_truncate on O_TRUNC opens (try #2)

Commit Message

Jeff Layton Dec. 7, 2010, 9:19 p.m. UTC

None

Patch

diff --git a/fs/namei.c b/fs/namei.c
index 5362af9..ad844eb 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1448,8 +1448,9 @@  int may_open(struct path *path, int acc_mode, int flag)
 	return break_lease(inode, flag);
 }
 
-static int handle_truncate(struct path *path)
+static int handle_truncate(struct file *filp)
 {
+	struct path *path = &filp->f_path;
 	struct inode *inode = path->dentry->d_inode;
 	int error = get_write_access(inode);
 	if (error)
@@ -1463,7 +1464,7 @@  static int handle_truncate(struct path *path)
 	if (!error) {
 		error = do_truncate(path->dentry, 0,
 				    ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,
-				    NULL);
+				    filp);
 	}
 	put_write_access(inode);
 	return error;
@@ -1560,7 +1561,7 @@  static struct file *finish_open(struct nameidata *nd,
 	}
 	if (!IS_ERR(filp)) {
 		if (will_truncate) {
-			error = handle_truncate(&nd->path);
+			error = handle_truncate(filp);
 			if (error) {
 				fput(filp);
 				filp = ERR_PTR(error);