[backfire] backport r26906
[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.32 / 214-mini_fo_2.6.29.patch
1 --- a/fs/mini_fo/aux.c
2 +++ b/fs/mini_fo/aux.c
3 @@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
4 mntget(src_mnt);
5
6 /* open file write only */
7 - tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
8 + tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
9 if(!tgt_file || IS_ERR(tgt_file)) {
10 printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
11 err = PTR_ERR(tgt_file);
12 @@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
13 }
14
15 /* open file read only */
16 - src_file = dentry_open(src_dentry, src_mnt, 0x0);
17 + src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
18 if(!src_file || IS_ERR(src_file)) {
19 printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
20 err = PTR_ERR(src_file);
21 --- a/fs/mini_fo/file.c
22 +++ b/fs/mini_fo/file.c
23 @@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
24 mntget(stopd(inode->i_sb)->hidden_mnt);
25 hidden_file = dentry_open(hidden_dentry,
26 stopd(inode->i_sb)->hidden_mnt,
27 - hidden_flags);
28 + hidden_flags, file->f_cred);
29 if (IS_ERR(hidden_file)) {
30 err = PTR_ERR(hidden_file);
31 dput(hidden_dentry);
32 @@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
33 mntget(stopd(inode->i_sb)->hidden_mnt);
34 hidden_file = dentry_open(hidden_dentry,
35 stopd(inode->i_sb)->hidden_mnt,
36 - hidden_flags);
37 + hidden_flags, file->f_cred);
38 if (IS_ERR(hidden_file)) {
39 err = PTR_ERR(hidden_file);
40 dput(hidden_dentry);
41 @@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
42 mntget(stopd(inode->i_sb)->hidden_mnt2);
43 hidden_sto_file = dentry_open(hidden_sto_dentry,
44 stopd(inode->i_sb)->hidden_mnt2,
45 - hidden_flags);
46 + hidden_flags, file->f_cred);
47
48 /* dentry_open dputs the dentry if it fails */
49 if (IS_ERR(hidden_sto_file)) {
50 --- a/fs/mini_fo/meta.c
51 +++ b/fs/mini_fo/meta.c
52 @@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
53
54
55 /* open META-file for reading */
56 - meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
57 + meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
58 if(!meta_file || IS_ERR(meta_file)) {
59 printk(KERN_CRIT "mini_fo: meta_build_lists: \
60 ERROR opening META file.\n");
61 @@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
62 mntget(meta_mnt);
63
64 /* open META-file for writing */
65 - meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
66 + meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
67 if(!meta_file || IS_ERR(meta_file)) {
68 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
69 ERROR opening meta file.\n");
70 @@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
71 mntget(meta_mnt);
72
73 /* open META-file for writing */
74 - meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
75 + meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
76 if(!meta_file || IS_ERR(meta_file)) {
77 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
78 ERROR opening meta file.\n");
79 @@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
80 mntget(meta_mnt);
81
82 /* open META-file for writing */
83 - meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
84 + meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
85 if(!meta_file || IS_ERR(meta_file)) {
86 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
87 ERROR opening meta file.\n");
88 @@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
89 mntget(meta_mnt);
90
91 /* open META-file for writing */
92 - meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
93 + meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
94 if(!meta_file || IS_ERR(meta_file)) {
95 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
96 ERROR opening meta file.\n");