---

yaml --- r: 71223 b: refs/heads/master c: d139d7f h: refs/heads/master i: 71221: 699c365 71219: d41ef17 71215: ff69bc8 v: v3
git-mirror · Oct 18, 2007 · 034d8c4 · 034d8c4
1 parent da93d8a
commit 034d8c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49d4914fd7c10ae846d0f30d5f6f4732cc68499c
+refs/heads/master: d139d7ffd0c1e81e2a809909b4f8b121a0dc119a
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -1659,8 +1659,10 @@ int may_open(struct nameidata *nd, int acc_mode, int flag)
 		error = locks_verify_locked(inode);
 		if (!error) {
 			DQUOT_INIT(inode);
-
-			error = do_truncate(dentry, 0, ATTR_MTIME|ATTR_CTIME, NULL);
+
+			error = do_truncate(dentry, 0,
+					    ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,
+					    NULL);
 		}
 		put_write_access(inode);
 		if (error)

diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
@@ -330,6 +330,7 @@ typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
 #define ATTR_KILL_SGID	4096
 #define ATTR_FILE	8192
 #define ATTR_KILL_PRIV	16384
+#define ATTR_OPEN	32768	/* Truncating from open(O_TRUNC) */
 
 /*
  * This is the Inode Attributes structure, used for notify_change().  It