3 Index: linux-2.6.0/fs/namei.c
4 ===================================================================
5 --- linux-2.6.0.orig/fs/namei.c 2004-01-04 15:22:42.000000000 +0300
6 +++ linux-2.6.0/fs/namei.c 2004-01-04 15:25:04.000000000 +0300
11 - error = do_truncate(dentry, 0);
12 + error = do_truncate(dentry, 0, 1);
14 put_write_access(inode);
18 struct dentry * dentry;
20 + intent_init(&nd.intent, IT_LOOKUP);
24 @@ -1531,6 +1532,15 @@
25 error = path_lookup(tmp, LOOKUP_PARENT, &nd);
29 + if (nd.dentry->d_inode->i_op->mknod_raw) {
30 + struct inode_operations *op = nd.dentry->d_inode->i_op;
31 + error = op->mknod_raw(&nd, mode, dev);
32 + /* the file system wants to use normal vfs path now */
33 + if (error != -EOPNOTSUPP)
37 dentry = lookup_create(&nd, 0);
38 error = PTR_ERR(dentry);
43 up(&nd.dentry->d_inode->i_sem);
48 @@ -1598,10 +1609,18 @@
50 struct dentry *dentry;
52 + intent_init(&nd.intent, IT_LOOKUP);
54 error = path_lookup(tmp, LOOKUP_PARENT, &nd);
57 + if (nd.dentry->d_inode->i_op->mkdir_raw) {
58 + struct inode_operations *op = nd.dentry->d_inode->i_op;
59 + error = op->mkdir_raw(&nd, mode);
60 + /* the file system wants to use normal vfs path now */
61 + if (error != -EOPNOTSUPP)
64 dentry = lookup_create(&nd, 1);
65 error = PTR_ERR(dentry);
66 if (!IS_ERR(dentry)) {
70 up(&nd.dentry->d_inode->i_sem);
77 struct dentry *dentry;
79 + intent_init(&nd.intent, IT_LOOKUP);
81 name = getname(pathname);
83 @@ -1711,6 +1732,16 @@
88 + if (nd.dentry->d_inode->i_op->rmdir_raw) {
89 + struct inode_operations *op = nd.dentry->d_inode->i_op;
91 + error = op->rmdir_raw(&nd);
92 + /* the file system wants to use normal vfs path now */
93 + if (error != -EOPNOTSUPP)
97 down(&nd.dentry->d_inode->i_sem);
98 dentry = lookup_hash(&nd.last, nd.dentry);
99 error = PTR_ERR(dentry);
100 @@ -1769,6 +1800,7 @@
101 struct dentry *dentry;
103 struct inode *inode = NULL;
104 + intent_init(&nd.intent, IT_LOOKUP);
106 name = getname(pathname);
108 @@ -1780,6 +1812,13 @@
110 if (nd.last_type != LAST_NORM)
112 + if (nd.dentry->d_inode->i_op->unlink_raw) {
113 + struct inode_operations *op = nd.dentry->d_inode->i_op;
114 + error = op->unlink_raw(&nd);
115 + /* the file system wants to use normal vfs path now */
116 + if (error != -EOPNOTSUPP)
119 down(&nd.dentry->d_inode->i_sem);
120 dentry = lookup_hash(&nd.last, nd.dentry);
121 error = PTR_ERR(dentry);
122 @@ -1847,10 +1886,18 @@
124 struct dentry *dentry;
126 + intent_init(&nd.intent, IT_LOOKUP);
128 error = path_lookup(to, LOOKUP_PARENT, &nd);
131 + if (nd.dentry->d_inode->i_op->symlink_raw) {
132 + struct inode_operations *op = nd.dentry->d_inode->i_op;
133 + error = op->symlink_raw(&nd, from);
134 + /* the file system wants to use normal vfs path now */
135 + if (error != -EOPNOTSUPP)
138 dentry = lookup_create(&nd, 0);
139 error = PTR_ERR(dentry);
140 if (!IS_ERR(dentry)) {
141 @@ -1858,6 +1905,7 @@
144 up(&nd.dentry->d_inode->i_sem);
149 @@ -1921,6 +1969,8 @@
150 struct nameidata nd, old_nd;
153 + intent_init(&nd.intent, IT_LOOKUP);
154 + intent_init(&old_nd.intent, IT_LOOKUP);
156 to = getname(newname);
158 @@ -1935,6 +1985,13 @@
160 if (old_nd.mnt != nd.mnt)
162 + if (nd.dentry->d_inode->i_op->link_raw) {
163 + struct inode_operations *op = nd.dentry->d_inode->i_op;
164 + error = op->link_raw(&old_nd, &nd);
165 + /* the file system wants to use normal vfs path now */
166 + if (error != -EOPNOTSUPP)
169 new_dentry = lookup_create(&nd, 0);
170 error = PTR_ERR(new_dentry);
171 if (!IS_ERR(new_dentry)) {
172 @@ -1985,7 +2042,7 @@
175 int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
176 - struct inode *new_dir, struct dentry *new_dentry)
177 + struct inode *new_dir, struct dentry *new_dentry)
180 struct inode *target;
181 @@ -2030,7 +2087,7 @@
184 int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
185 - struct inode *new_dir, struct dentry *new_dentry)
186 + struct inode *new_dir, struct dentry *new_dentry)
188 struct inode *target;
190 @@ -2107,6 +2164,8 @@
191 struct dentry * old_dentry, *new_dentry;
192 struct dentry * trap;
193 struct nameidata oldnd, newnd;
194 + intent_init(&oldnd.intent, IT_LOOKUP);
195 + intent_init(&newnd.intent, IT_LOOKUP);
197 error = path_lookup(oldname, LOOKUP_PARENT, &oldnd);
199 @@ -2129,6 +2188,13 @@
200 if (newnd.last_type != LAST_NORM)
203 + if (old_dir->d_inode->i_op->rename_raw) {
204 + error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd);
205 + /* the file system wants to use normal vfs path now */
206 + if (error != -EOPNOTSUPP)
210 trap = lock_rename(new_dir, old_dir);
212 old_dentry = lookup_hash(&oldnd.last, old_dir);
213 @@ -2160,8 +2226,7 @@
214 if (new_dentry == trap)
217 - error = vfs_rename(old_dir->d_inode, old_dentry,
218 - new_dir->d_inode, new_dentry);
219 + error = vfs_rename(old_dir->d_inode, old_dentry, new_dir->d_inode, new_dentry);
223 Index: linux-2.6.0/fs/open.c
224 ===================================================================
225 --- linux-2.6.0.orig/fs/open.c 2004-01-04 15:21:49.000000000 +0300
226 +++ linux-2.6.0/fs/open.c 2004-01-04 15:25:04.000000000 +0300
231 -int do_truncate(struct dentry *dentry, loff_t length)
232 +int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
235 + struct inode_operations *op = dentry->d_inode->i_op;
236 struct iattr newattrs;
238 /* Not pretty: "inode->i_size" shouldn't really be signed. But it is. */
240 newattrs.ia_size = length;
241 newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
242 down(&dentry->d_inode->i_sem);
243 - err = notify_change(dentry, &newattrs);
244 + if (called_from_open)
245 + newattrs.ia_valid |= ATTR_FROM_OPEN;
246 + if (op->setattr_raw) {
247 + newattrs.ia_valid |= ATTR_RAW;
248 + newattrs.ia_ctime = CURRENT_TIME;
249 + err = op->setattr_raw(dentry->d_inode, &newattrs);
251 + err = notify_change(dentry, &newattrs);
252 up(&dentry->d_inode->i_sem);
256 error = locks_verify_truncate(inode, NULL, length);
259 - error = do_truncate(nd.dentry, length);
260 + error = do_truncate(nd.dentry, length, 0);
262 put_write_access(inode);
266 error = locks_verify_truncate(inode, file, length);
268 - error = do_truncate(dentry, length);
269 + error = do_truncate(dentry, length, 0);
274 (error = permission(inode,MAY_WRITE,&nd)) != 0)
277 - down(&inode->i_sem);
278 - error = notify_change(nd.dentry, &newattrs);
280 + if (inode->i_op->setattr_raw) {
281 + struct inode_operations *op = nd.dentry->d_inode->i_op;
283 + newattrs.ia_valid |= ATTR_RAW;
284 + error = op->setattr_raw(inode, &newattrs);
285 + /* the file system wants to use normal vfs path now */
286 + if (error != -EOPNOTSUPP)
289 + down(&inode->i_sem);
290 + error = notify_change(nd.dentry, &newattrs);
297 (error = permission(inode,MAY_WRITE,&nd)) != 0)
300 - down(&inode->i_sem);
301 - error = notify_change(nd.dentry, &newattrs);
303 + if (inode->i_op->setattr_raw) {
304 + struct inode_operations *op = nd.dentry->d_inode->i_op;
306 + newattrs.ia_valid |= ATTR_RAW;
307 + error = op->setattr_raw(inode, &newattrs);
308 + /* the file system wants to use normal vfs path now */
309 + if (error != -EOPNOTSUPP)
312 + down(&inode->i_sem);
313 + error = notify_change(nd.dentry, &newattrs);
320 if (IS_RDONLY(inode))
323 + if (inode->i_op->setattr_raw) {
324 + struct inode_operations *op = nd.dentry->d_inode->i_op;
326 + newattrs.ia_mode = mode;
327 + newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
328 + newattrs.ia_valid |= ATTR_RAW;
329 + error = op->setattr_raw(inode, &newattrs);
330 + /* the file system wants to use normal vfs path now */
331 + if (error != -EOPNOTSUPP)
336 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
339 if (IS_RDONLY(inode))
342 + if (inode->i_op->setattr_raw) {
343 + struct inode_operations *op = dentry->d_inode->i_op;
345 + newattrs.ia_uid = user;
346 + newattrs.ia_gid = group;
347 + newattrs.ia_valid = ATTR_UID | ATTR_GID;
348 + newattrs.ia_valid |= ATTR_RAW;
349 + error = op->setattr_raw(inode, &newattrs);
350 + /* the file system wants to use normal vfs path now */
351 + if (error != -EOPNOTSUPP)
354 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
356 newattrs.ia_valid = ATTR_CTIME;
359 if (!S_ISDIR(inode->i_mode))
360 newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
363 error = notify_change(dentry, &newattrs);
365 Index: linux-2.6.0/fs/exec.c
366 ===================================================================
367 --- linux-2.6.0.orig/fs/exec.c 2004-01-04 15:21:49.000000000 +0300
368 +++ linux-2.6.0/fs/exec.c 2004-01-04 15:25:04.000000000 +0300
369 @@ -1405,7 +1405,7 @@
371 if (!file->f_op->write)
373 - if (do_truncate(file->f_dentry, 0) != 0)
374 + if (do_truncate(file->f_dentry, 0, 0) != 0)
377 retval = binfmt->core_dump(signr, regs, file);
378 Index: linux-2.6.0/include/linux/fs.h
379 ===================================================================
380 --- linux-2.6.0.orig/include/linux/fs.h 2004-01-04 15:21:49.000000000 +0300
381 +++ linux-2.6.0/include/linux/fs.h 2004-01-04 15:25:04.000000000 +0300
382 @@ -836,13 +836,20 @@
383 int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
384 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
385 int (*link) (struct dentry *,struct inode *,struct dentry *);
386 + int (*link_raw) (struct nameidata *,struct nameidata *);
387 int (*unlink) (struct inode *,struct dentry *);
388 + int (*unlink_raw) (struct nameidata *);
389 int (*symlink) (struct inode *,struct dentry *,const char *);
390 + int (*symlink_raw) (struct nameidata *,const char *);
391 int (*mkdir) (struct inode *,struct dentry *,int);
392 + int (*mkdir_raw) (struct nameidata *,int);
393 int (*rmdir) (struct inode *,struct dentry *);
394 + int (*rmdir_raw) (struct nameidata *);
395 int (*mknod) (struct inode *,struct dentry *,int,dev_t);
396 + int (*mknod_raw) (struct nameidata *,int,dev_t);
397 int (*rename) (struct inode *, struct dentry *,
398 struct inode *, struct dentry *);
399 + int (*rename_raw) (struct nameidata *, struct nameidata *);
400 int (*readlink) (struct dentry *, char __user *,int);
401 int (*follow_link) (struct dentry *, struct nameidata *);
402 void (*truncate) (struct inode *);
403 @@ -1127,7 +1134,7 @@
405 asmlinkage long sys_open(const char __user *, int, int);
406 asmlinkage long sys_close(unsigned int); /* yes, it's really unsigned */
407 -extern int do_truncate(struct dentry *, loff_t start);
408 +extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
410 extern struct file *filp_open(const char *, int, int);
411 extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
412 Index: linux-2.6.0/net/unix/af_unix.c
413 ===================================================================
414 --- linux-2.6.0.orig/net/unix/af_unix.c 2004-01-04 15:21:21.000000000 +0300
415 +++ linux-2.6.0/net/unix/af_unix.c 2004-01-04 15:25:18.000000000 +0300
419 if (sunname->sun_path[0]) {
420 + intent_init(&nd.intent, IT_LOOKUP);
421 err = path_lookup(sunname->sun_path, LOOKUP_FOLLOW, &nd);