1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
Files linux-2.6.16.20-vs2.1.1-rc23/fs/.namei.c.swo and linux-2.6.16.20-vs2.1.1-rc23.1/fs/.namei.c.swo differ
Index: linux-2.6.16/fs/namei.c
===================================================================
--- linux-2.6.16.orig/fs/namei.c
+++ linux-2.6.16/fs/namei.c
@@ -2691,7 +2691,7 @@ retry:
vxdprintk(VXD_CBIT(misc, 2),
"lookup_create(new): %p", new_dentry);
if (!new_dentry)
- goto out_rel_path;
+ goto release_path;
ret = vfs_create(dir_nd.dentry->d_inode, new_dentry, mode, &dir_nd);
vxdprintk(VXD_CBIT(misc, 2),
@@ -2701,7 +2701,7 @@ retry:
retry = 0;
}
if (ret)
- goto out_rel_both;
+ goto unlock_dput;
new_mnt = dir_nd.mnt;
@@ -2712,7 +2712,7 @@ retry:
vxdprintk(VXD_CBIT(misc, 2),
"dentry_open(old): %p", old_file);
if (!old_file)
- goto out_rel_both;
+ goto unlock_dput;
dget(new_dentry);
mntget(new_mnt);
@@ -2721,14 +2721,14 @@ retry:
vxdprintk(VXD_CBIT(misc, 2),
"dentry_open(new): %p", new_file);
if (!new_file)
- goto out_fput_old;
+ goto fput_old;
size = i_size_read(old_file->f_dentry->d_inode);
ret = vfs_sendfile(new_file, old_file, NULL, size, 0);
vxdprintk(VXD_CBIT(misc, 2), "vfs_sendfile: %d", ret);
if (ret < 0)
- goto out_fput_both;
+ goto fput_both;
ret = vfs_rename(dir_nd.dentry->d_inode, new_dentry,
old_nd.dentry->d_parent->d_inode, old_dentry);
@@ -2736,22 +2736,22 @@ retry:
if (!ret)
err = 0;
-out_fput_both:
+fput_both:
vxdprintk(VXD_CBIT(misc, 3),
"fput(new_file=%p[#%d])", new_file,
atomic_read(&new_file->f_count));
fput(new_file);
-out_fput_old:
+fput_old:
vxdprintk(VXD_CBIT(misc, 3),
"fput(old_file=%p[#%d])", old_file,
atomic_read(&old_file->f_count));
fput(old_file);
-out_rel_both:
+unlock_dput:
mutex_unlock(&dir_nd.dentry->d_inode->i_mutex);
dput(new_dentry);
-out_rel_path:
+release_path:
path_release(&dir_nd);
if (retry--)
goto retry;
|
GitWeb
