3 .old..........pc/vfs_nointent_2.6.0-suse/fs/namei.c
4 .new.........fs/namei.c
5 Index: linux-2.6.5-12.1/fs/namei.c
6 ===================================================================
7 --- linux-2.6.5-12.1.orig/fs/namei.c 2004-05-11 15:41:54.000000000 -0400
8 +++ linux-2.6.5-12.1/fs/namei.c 2004-05-11 15:42:00.000000000 -0400
13 - error = do_truncate(dentry, 0);
14 + error = do_truncate(dentry, 0, 1);
16 put_write_access(inode);
20 struct dentry * dentry;
22 + intent_init(&nd.intent, IT_LOOKUP);
26 @@ -1554,6 +1555,15 @@
27 error = path_lookup(tmp, LOOKUP_PARENT, &nd);
31 + if (nd.dentry->d_inode->i_op->mknod_raw) {
32 + struct inode_operations *op = nd.dentry->d_inode->i_op;
33 + error = op->mknod_raw(&nd, mode, dev);
34 + /* the file system wants to use normal vfs path now */
35 + if (error != -EOPNOTSUPP)
39 dentry = lookup_create(&nd, 0);
40 error = PTR_ERR(dentry);
45 up(&nd.dentry->d_inode->i_sem);
50 @@ -1626,10 +1637,18 @@
52 struct dentry *dentry;
54 + intent_init(&nd.intent, IT_LOOKUP);
56 error = path_lookup(tmp, LOOKUP_PARENT, &nd);
59 + if (nd.dentry->d_inode->i_op->mkdir_raw) {
60 + struct inode_operations *op = nd.dentry->d_inode->i_op;
61 + error = op->mkdir_raw(&nd, mode);
62 + /* the file system wants to use normal vfs path now */
63 + if (error != -EOPNOTSUPP)
66 dentry = lookup_create(&nd, 1);
67 error = PTR_ERR(dentry);
68 if (!IS_ERR(dentry)) {
72 up(&nd.dentry->d_inode->i_sem);
79 struct dentry *dentry;
81 + intent_init(&nd.intent, IT_LOOKUP);
83 name = getname(pathname);
85 @@ -1744,6 +1765,14 @@
89 + if (nd.dentry->d_inode->i_op->rmdir_raw) {
90 + struct inode_operations *op = nd.dentry->d_inode->i_op;
92 + error = op->rmdir_raw(&nd);
93 + /* the file system wants to use normal vfs path now */
94 + 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 @@ -1805,6 +1834,7 @@
101 struct dentry *dentry;
103 struct inode *inode = NULL;
104 + intent_init(&nd.intent, IT_LOOKUP);
106 name = getname(pathname);
108 @@ -1818,6 +1848,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 @@ -1891,10 +1928,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 @@ -1902,6 +1947,7 @@
144 up(&nd.dentry->d_inode->i_sem);
149 @@ -1968,6 +2014,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 @@ -1986,6 +2034,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 @@ -2038,7 +2093,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 @@ -2083,7 +2138,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 @@ -2160,6 +2215,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 @@ -2182,6 +2239,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 @@ -2213,8 +2277,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.5-12.1/fs/open.c
224 ===================================================================
225 --- linux-2.6.5-12.1.orig/fs/open.c 2004-05-11 15:41:54.000000000 -0400
226 +++ linux-2.6.5-12.1/fs/open.c 2004-05-11 16:07:02.000000000 -0400
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_valid = ATTR_SIZE | ATTR_CTIME;
241 down(&dentry->d_inode->i_sem);
242 down_write(&dentry->d_inode->i_alloc_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_write(&dentry->d_inode->i_alloc_sem);
253 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);
296 @@ -613,39 +631,55 @@
300 -asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
301 +int chmod_common(struct dentry *dentry, mode_t mode)
303 - struct inode * inode;
304 - struct dentry * dentry;
305 - struct file * file;
307 + struct inode * inode = dentry->d_inode;
308 struct iattr newattrs;
309 + int error = -EROFS;
311 - FSHOOK_BEGIN(fchmod, err, .fd = fd, .mode = mode)
316 + if (IS_RDONLY(inode))
319 + if (inode->i_op->setattr_raw) {
320 + struct inode_operations *op = dentry->d_inode->i_op;
322 + newattrs.ia_mode = mode;
323 + newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
324 + newattrs.ia_valid |= ATTR_RAW;
325 + error = op->setattr_raw(inode, &newattrs);
326 + /* the file system wants to use the normal vfs path now */
327 + if (error != -EOPNOTSUPP)
331 - dentry = file->f_dentry;
332 - inode = dentry->d_inode;
335 - if (IS_RDONLY(inode))
339 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
344 if (mode == (mode_t) -1)
345 mode = inode->i_mode;
346 newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
347 newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
348 - err = notify_change(dentry, &newattrs);
349 + error = notify_change(dentry, &newattrs);
357 +asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
359 + struct file * file;
362 + FSHOOK_BEGIN(fchmod, err, .fd = fd, .mode = mode)
368 + err = chmod_common(file->f_dentry, mode);
373 asmlinkage long sys_chmod(const char __user * filename, mode_t mode)
376 - struct inode * inode;
378 - struct iattr newattrs;
380 FSHOOK_BEGIN_USER_PATH_WALK(chmod,
386 - inode = nd.dentry->d_inode;
389 - if (IS_RDONLY(inode))
393 - if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
396 - down(&inode->i_sem);
397 - if (mode == (mode_t) -1)
398 - mode = inode->i_mode;
399 - newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
400 - newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
401 - error = notify_change(nd.dentry, &newattrs);
405 + error = chmod_common(nd.dentry, mode);
408 FSHOOK_END_USER_WALK(chmod, error, path)
410 if (IS_RDONLY(inode))
413 + if (inode->i_op->setattr_raw) {
414 + struct inode_operations *op = dentry->d_inode->i_op;
416 + newattrs.ia_uid = user;
417 + newattrs.ia_gid = group;
418 + newattrs.ia_valid = ATTR_UID | ATTR_GID;
419 + newattrs.ia_valid |= ATTR_RAW;
420 + error = op->setattr_raw(inode, &newattrs);
421 + /* the file system wants to use normal vfs path now */
422 + if (error != -EOPNOTSUPP)
425 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
427 newattrs.ia_valid = ATTR_CTIME;
430 if (!S_ISDIR(inode->i_mode))
431 newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
434 error = notify_change(dentry, &newattrs);
436 Index: linux-2.6.5-12.1/fs/exec.c
437 ===================================================================
438 --- linux-2.6.5-12.1.orig/fs/exec.c 2004-05-11 15:41:54.000000000 -0400
439 +++ linux-2.6.5-12.1/fs/exec.c 2004-05-11 15:42:00.000000000 -0400
440 @@ -1435,7 +1435,7 @@
442 if (!file->f_op->write)
444 - if (do_truncate(file->f_dentry, 0) != 0)
445 + if (do_truncate(file->f_dentry, 0, 0) != 0)
448 retval = binfmt->core_dump(signr, regs, file);
449 Index: linux-2.6.5-12.1/include/linux/fs.h
450 ===================================================================
451 --- linux-2.6.5-12.1.orig/include/linux/fs.h 2004-05-11 15:41:54.000000000 -0400
452 +++ linux-2.6.5-12.1/include/linux/fs.h 2004-05-11 15:42:00.000000000 -0400
453 @@ -878,13 +878,20 @@
454 int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
455 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
456 int (*link) (struct dentry *,struct inode *,struct dentry *);
457 + int (*link_raw) (struct nameidata *,struct nameidata *);
458 int (*unlink) (struct inode *,struct dentry *);
459 + int (*unlink_raw) (struct nameidata *);
460 int (*symlink) (struct inode *,struct dentry *,const char *);
461 + int (*symlink_raw) (struct nameidata *,const char *);
462 int (*mkdir) (struct inode *,struct dentry *,int);
463 + int (*mkdir_raw) (struct nameidata *,int);
464 int (*rmdir) (struct inode *,struct dentry *);
465 + int (*rmdir_raw) (struct nameidata *);
466 int (*mknod) (struct inode *,struct dentry *,int,dev_t);
467 + int (*mknod_raw) (struct nameidata *,int,dev_t);
468 int (*rename) (struct inode *, struct dentry *,
469 struct inode *, struct dentry *);
470 + int (*rename_raw) (struct nameidata *, struct nameidata *);
471 int (*readlink) (struct dentry *, char __user *,int);
472 int (*follow_link) (struct dentry *, struct nameidata *);
473 void (*truncate) (struct inode *);
474 @@ -1182,7 +1189,7 @@
478 -extern int do_truncate(struct dentry *, loff_t start);
479 +extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
480 extern struct file *filp_open(const char *, int, int);
481 extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
482 extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
483 Index: linux-2.6.5-12.1/net/unix/af_unix.c
484 ===================================================================
485 --- linux-2.6.5-12.1.orig/net/unix/af_unix.c 2004-04-03 22:37:36.000000000 -0500
486 +++ linux-2.6.5-12.1/net/unix/af_unix.c 2004-05-11 15:42:00.000000000 -0400
490 if (sunname->sun_path[0]) {
491 + intent_init(&nd.intent, IT_LOOKUP);
492 err = path_lookup(sunname->sun_path, LOOKUP_FOLLOW, &nd);