How to Force PIO mode on sata promise (Linux 2.6.10)
Subsystems (7)
Hi Bill,
I've reduced the UDMA level step by step until the problem seems disappeared.
Finally with UDMA/25 I don't detect error after 1000 copies. I consider that this solution corrects the symptom but not the cause...
I try memtest for mips arch and all is ok.
I try 3 promise controllers: the problem was NOT resolved.
I try more than 4 kind of disk: the problem was NOT resolved.
I try to connect the disk on the pata port and on the sata port: the problem was NOT resolved. More when I connect the disk to the IDE interface, it doesn't work at all (maybe bad driver implementation)...
David
My embedded system:
* AMD Development Board AU1550 (mips32) + hdd connected to the pata port of the Promise PDC20579 controller.
* Kernel2.6.10 + libata patch + busybox 1.0
-----Message d'origine-----
De : [email protected] [mailto:[email protected]] De la part de Bill Davidsen Envoyé : jeudi 22 septembre 2005 18:45
À : David Sanchez
Cc : Jeff Garzik; [email protected]
Objet : Re: How to Force PIO mode on sata promise (Linux 2.6.10)
Quoted 9 lines · David Sanchez
Hi Chris,
It was a good idea but it doesn't resolve the problem...I add my card into the
dma_black_listof the libata to force DMA disabled and the problem seems to no more appear...maybe PIO is so slow that the data has no time to be corrupted... But I can NOT affirm that the problem is the DMA.I try the linux kernel 2.4,2.6.11, 2.6.12 and 2.6.13. More I try 2 different toolchains and the problem persists...
Another idea??
You disable DMA and the problem goes away, that seems to point to DMA as the problem, and since others aren't having the same problem with the DMA code in the kernel it certainly suggests the DMA hardware really is the problem, or is causing it. It's remotely possible that the kernel has a bug in the code just for your controller, although unlikely.
Have you run memtest86 on your memory? I have seen cases where memory was marginal and using CPU and DMA was enough to cause it to fail, but only when people had played with the memory timing in the BIOS. I suspect the SATA disk has a higher datarate than anything else in your system, so it could trigger some marginal cases in the memory system. Unlikely, but possible.
ideas:
test your memory if you haven't
Check that your BIOS is up-to-date
check your BIOS memory timing settings
See if the controller came with tools to adjust DMA timing try writing to a PATA drive while reading from the SATA
to generate high DMA rate, look for corruption there
try another controller of the same type
try another controler of another supported type
to see that it's not your drive
accept that your controller *belongs* on the blacklist
Since you asked for ideas, these are probably in order of easy to difficult.
Signature · 8 lines
-bill davidsen ([email protected]) "The secret to procrastination is to put things off until the last possible moment - but no longer" -me - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Hello, David!
Quoted 2 lines · David Sanchez
I've reduced the UDMA level step by step until the problem seems disappeared.
Finally with UDMA/25 I don't detect error after 1000 copies. I consider that this solution corrects the symptom but not the cause...
Hmm, no luck for you, today?
Have you possibilities to check the signal integrity in your design? Did you play some of the electrical engineering tricks to see if things are changing? (change some terminations, temperature, voltages)
Quoted 3 lines
My embedded system:
* AMD Development Board AU1550 (mips32) + hdd connected to the pata port of the Promise PDC20579 controller.
* Kernel2.6.10 + libata patch + busybox 1.0
Well, what about getting a datasheet of the PDC, one of the latest kernels and start to debug that thing down to the silicon?
There is a person called Ed Huang (Sales and Marketing Div.) at Promise in Taiwan where we got our datasheets and reference designs for our embedded project. Unfortunately, you need to sign a NDA. But beside that, the support is pretty okay. (I just send you the contact in private email).
Best greets,
Signature · 11 lines
Clemens Koller _______________________________ R&D Imaging Devices Anagramm GmbH Rupert-Mayer-Str. 45/1 81379 Muenchen Germany http://www.anagramm.de Phone: +49-89-741518-50 Fax: +49-89-741518-19
PATCH 1/1 reduce sizeof(struct file)
Hi all
Now that RCU applied on 'struct file' seems stable, we can place f_rcuhead in a memory location that is not anymore used at call_rcu(&f->f_rcuhead, file_free_rcu) time, to reduce the size of this critical kernel object.
The trick I used is to move f_rcuhead and f_list in an union and defining macros to access f_list and f_rcuhead
Unfortunatly f_list was also used in IPVS so I had to change include/net/ip_vs.h and net/ipv4/ipvs/ip_vs_ctl.c, changing their f_list to ipvs_f_list to avoid name clash.
(This is why I send this mail to IPVS maintainers)
Thank you
include/linux/fs.h +10 -2
@@ -574,7 +574,16 @@#define RA_FLAG_INCACHE 0x02/* file is already in cache */ struct file { -struct list_head f_list; +/* +* f_list and f_rcuhead can share the same memory location +*/ +union { +struct list_head uf_f_list; +struct rcu_head uf_f_rcuhead; + } uf; +#define f_list uf.uf_f_list +#define f_rcuhead uf.uf_f_rcuhead +struct dentry *f_dentry;struct vfsmount *f_vfsmnt;struct file_operations *f_op;
@@ -598,7 +607,6 @@spinlock_t f_ep_lock;#endif /* #ifdef CONFIG_EPOLL */ struct address_space *f_mapping; -struct rcu_head f_rcuhead; };extern spinlock_t files_lock;#define file_list_lock () spin_lock(&files_lock);
include/net/ip_vs.h +1 -1
@@ -548,7 +548,7 @@*/ struct ip_vs_service {struct list_head s_list;/* for normal service table */ -struct list_head f_list;/* for fwmark-based service table */ +struct list_head ipvs_f_list;/* for fwmark-based service table */ atomic_t refcnt;/* reference counter */ atomic_t usecnt;/* use counter */
net/ipv4/ipvs/ip_vs_ctl.c +10 -10
@@ -322,7 +322,7 @@* Hash it by fwmark in ip_vs_svc_fwm_table */ hash =ip_vs_svc_fwm_hashkey (svc->fwmark); -list_add (&svc->f_list, &ip_vs_svc_fwm_table[hash]); +list_add (&svc->ipvs_f_list, &ip_vs_svc_fwm_table[hash]); } svc->flags |=IP_VS_SVC_F_HASHED ;
@@ -349,7 +349,7 @@list_del (&svc->s_list); }else {/* Remove it from the ip_vs_svc_fwm_table table */ -list_del (&svc->f_list); +list_del (&svc->ipvs_f_list); } svc->flags &= ~IP_VS_SVC_F_HASHED ;
@@ -395,7 +395,7 @@/* Check for fwmark addressed entries */ hash =ip_vs_svc_fwm_hashkey (fwmark); -list_for_each_entry (svc, &ip_vs_svc_fwm_table[hash], f_list) { +list_for_each_entry (svc, &ip_vs_svc_fwm_table[hash], ipvs_f_list) {if (svc->fwmark == fwmark) {/* HIT */ atomic_inc (&svc->usecnt);
@@ -1297,7 +1297,7 @@*/ for (idx =0 ; idx <IP_VS_SVC_TAB_SIZE ; idx++) {list_for_each_entry_safe (svc, nxt, - &ip_vs_svc_fwm_table[idx], f_list) { + &ip_vs_svc_fwm_table[idx], ipvs_f_list) {write_lock_bh (&__ip_vs_svc_lock);ip_vs_svc_unhash (svc);/*
@@ -1341,7 +1341,7 @@ }for (idx =0 ; idx <IP_VS_SVC_TAB_SIZE ; idx++) { -list_for_each_entry (svc, &ip_vs_svc_fwm_table[idx], f_list) { +list_for_each_entry (svc, &ip_vs_svc_fwm_table[idx], ipvs_f_list) {ip_vs_zero_service (svc); } }
@@ -1666,7 +1666,7 @@/* keep looking in fwmark */ for (idx =0 ; idx <IP_VS_SVC_TAB_SIZE ; idx++) { -list_for_each_entry (svc, &ip_vs_svc_fwm_table[idx], f_list) { +list_for_each_entry (svc, &ip_vs_svc_fwm_table[idx], ipvs_f_list) {if (pos-- ==0 ) { iter->table = ip_vs_svc_fwm_table; iter->bucket = idx;
@@ -1718,13 +1718,13 @@ }/* next service in hashed by fwmark */ -if ((e = svc->f_list.next) != &ip_vs_svc_fwm_table[iter->bucket]) - return list_entry(e, struct ip_vs_service, f_list); +if ((e = svc->ipvs_f_list.next) != &ip_vs_svc_fwm_table[iter->bucket]) + return list_entry(e, struct ip_vs_service, ipvs_f_list); scan_fwmark:while (++iter->bucket <IP_VS_SVC_TAB_SIZE ) {list_for_each_entry (svc, &ip_vs_svc_fwm_table[iter->bucket], - f_list) + ipvs_f_list)return svc; }
@@ -2095,7 +2095,7 @@ }for (idx =0 ; idx <IP_VS_SVC_TAB_SIZE ; idx++) { -list_for_each_entry (svc, &ip_vs_svc_fwm_table[idx], f_list) { +list_for_each_entry (svc, &ip_vs_svc_fwm_table[idx], ipvs_f_list) {if (count >= get->num_services) goto out;memset (&entry,0 ,sizeof (entry));
Re: [PATCH] reduce sizeof(struct file)
Quoted 6 lines · Eric Dumazet
Hi all
Now that RCU applied on 'struct file' seems stable, we can place
f_rcuheadin a memory location that is not anymore used atcall_rcu(&f->f_rcuhead, file_free_rcu)time, to reduce the size of this critical kernel object.
Quoted 8 lines
The trick I used is to move
f_rcuheadandf_listin an union and defining macros to accessf_listandf_rcuheadUnfortunatly
f_listwas also used in IPVS so I had to changeinclude/net/ip_vs.handnet/ipv4/ipvs/ip_vs_ctl.c, changing theirf_listtoipvs_f_listto avoid name clash.(This is why I send this mail to IPVS maintainers)
Please just change all callers to use the union, there's not very many of them.
Re: [PATCH] reduce sizeof(struct file)
Quoted 10 lines · Christoph Hellwig
Quoted 9 lines · Eric Dumazet
Hi all
Now that RCU applied on 'struct file' seems stable, we can place
f_rcuheadin a memory location that is not anymore used atcall_rcu(&f->f_rcuhead, file_free_rcu)time, to reduce the size of this critical kernel object.The trick I used is to move
f_rcuheadandf_listin an union and defining macros to accessf_listandf_rcuhead
Quoted 9 lines
Quoted 5 lines
Unfortunatly
f_listwas also used in IPVS so I had to changeinclude/net/ip_vs.handnet/ipv4/ipvs/ip_vs_ctl.c, changing theirf_listtoipvs_f_listto avoid name clash.(This is why I send this mail to IPVS maintainers)
Please just change all callers to use the union, there's not very many of them.
How about anonymous unions ? gcc-3.3.3 and above support them. Is 2.6 supposed to be built with 2.95 ?
--
J.A. Magallon <jamagallon()able!es> \ Software is like sex:
werewolf!able!es \ It's better when it's free
Mandriva Linux release 2006.0 (2006 rc2) for i586
Linux 2.6.13-jam6 (gcc 4.0.1 (4.0.1-5mdk for Mandriva Linux release 2006.0))
Re: [PATCH] reduce sizeof(struct file)
Quoted 16 lines · J.A. Magallon
Quoted 14 lines · Christoph Hellwig
Quoted 13 lines · Eric Dumazet
Hi all
Now that RCU applied on 'struct file' seems stable, we can place
f_rcuheadin a memory location that is not anymore used atcall_rcu(&f->f_rcuhead, file_free_rcu)time, to reduce the size of this critical kernel object.The trick I used is to move
f_rcuheadandf_listin an union and defining macros to accessf_listandf_rcuheadUnfortunatly
f_listwas also used in IPVS so I had to changeinclude/net/ip_vs.handnet/ipv4/ipvs/ip_vs_ctl.c, changing theirf_listtoipvs_f_listto avoid name clash.
Quoted 9 lines
Quoted 5 lines
Quoted 1 line
(This is why I send this mail to IPVS maintainers)
Please just change all callers to use the union, there's not very many of them.
How about anonymous unions ? gcc-3.3.3 and above support them. Is 2.6 supposed to be built with 2.95 ?
Yes, 2.6.x is expected to build with gcc 2.95.3+
--
Jesper Juhl <[email protected]>
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please http://www.expita.com/nomime.html
Re: [PATCH] reduce sizeof(struct file)
In reply to J.A. MagallonQuoted 2 lines · J.A. Magallon
How about anonymous unions ? gcc-3.3.3 and above support them. Is 2.6 supposed to be built with 2.95 ?
NAK. For one thing, yes, it is supposed to be built with 2.95. For another, they do not buy you anything - few enough places use either field, so there is no point in hiding that union.
Re: [PATCH] reduce sizeof(struct file)
In reply to Christoph HellwigQuoted 3 lines · Christoph Hellwig
Please just change all callers to use the union, there's not very many of them.
Yes it's better, thanks Christoph.
What about this version then ?
Hi all
Now that RCU applied on 'struct file' seems stable, we can place f_rcuhead in a memory location that is not anymore used at call_rcu(&f->f_rcuhead, file_free_rcu) time, to reduce the size of this critical kernel object.
The trick I used is to move f_rcuhead and f_list in an union called f_u
The callers are changed so that f_rcuhead becomes f_u.fu_rcuhead and f_list becomes f_u.f_list
Tested on allyesconfig, diffed against 2.6.14-rc2
drivers/char/tty_io.c | 2 +- fs/dquot.c | 2 +- fs/file_table.c | 14 +++++++------- fs/proc/generic.c | 2 +- fs/super.c | 2 +- include/linux/fs.h | 9 +++++++-- security/selinux/hooks.c | 2 +- security/selinux/selinuxfs.c | 2 +- 8 files changed, 20 insertions(+), 15 deletions(-)
Thank you
include/linux/fs.h +7 -2
@@ -574,7 +574,13 @@#define RA_FLAG_INCACHE 0x02/* file is already in cache */ struct file { -struct list_head f_list; +/* +* f_list and f_rcuhead can share the same memory location +*/ +union { +struct list_head fu_list; +struct rcu_head fu_rcuhead; + } f_u;struct dentry *f_dentry;struct vfsmount *f_vfsmnt;struct file_operations *f_op;
@@ -598,7 +604,6 @@spinlock_t f_ep_lock;#endif /* #ifdef CONFIG_EPOLL */ struct address_space *f_mapping; -struct rcu_head f_rcuhead; };extern spinlock_t files_lock;#define file_list_lock () spin_lock(&files_lock);
fs/file_table.c +7 -7
@@ -56,13 +56,13 @@static inline void file_free_rcu (struct rcu_head *head) { - struct file *f = container_of(head, struct file, f_rcuhead); + struct file *f = container_of(head, struct file, f_u.fu_rcuhead);kmem_cache_free (filp_cachep, f); }static inline void file_free (struct file *f) { -call_rcu (&f->f_rcuhead, file_free_rcu); +call_rcu (&f->f_u.fu_rcuhead, file_free_rcu); }/* Find an unused file structure and return a pointer to it.
@@ -95,7 +95,7 @@ f->f_gid = current->fsgid;rwlock_init (&f->f_owner.lock);/* f->f_version: 0 */ -INIT_LIST_HEAD (&f->f_list); +INIT_LIST_HEAD (&f->f_u.fu_list);return f; over:
@@ -225,15 +225,15 @@if (!list)return ;file_list_lock (); -list_move (&file->f_list, list); +list_move (&file->f_u.fu_list, list);file_list_unlock (); }void file_kill (struct file *file) { -if (!list_empty (&file->f_list)) { +if (!list_empty (&file->f_u.fu_list)) {file_list_lock (); -list_del_init (&file->f_list); +list_del_init (&file->f_u.fu_list);file_list_unlock (); } }
@@ -245,7 +245,7 @@/* Check that no files are currently opened for writing. */ file_list_lock ();list_for_each (p, &sb->s_files) { - struct file *file = list_entry(p, struct file, f_list); + struct file *file = list_entry(p, struct file, f_u.fu_list);struct inode *inode = file->f_dentry->d_inode;/* File with pending delete? */
drivers/char/tty_io.c +1 -1
@@ -809,7 +809,7 @@check_tty_count (tty,"do_tty_hangup" );file_list_lock ();/* This breaks for file handles being sent over AF_UNIX sockets ? */ -list_for_each_entry (filp, &tty->tty_files, f_list) { +list_for_each_entry (filp, &tty->tty_files, f_u.fu_list) {if (filp->f_op->write == redirected_tty_write) cons_filp = filp;if (filp->f_op->write != tty_write)
fs/dquot.c +1 -1
@@ -662,7 +662,7 @@ restart:file_list_lock ();list_for_each (p, &sb->s_files) { - struct file *filp = list_entry(p, struct file, f_list); + struct file *filp = list_entry(p, struct file, f_u.fu_list);struct inode *inode = filp->f_dentry->d_inode;if (filp->f_mode &FMODE_WRITE &&dqinit_needed (inode, type)) {struct dentry *dentry =dget (filp->f_dentry);
fs/proc/generic.c +1 -1
@@ -533,7 +533,7 @@*/ file_list_lock ();list_for_each (p, &sb->s_files) { - struct file * filp = list_entry(p, struct file, f_list); + struct file * filp = list_entry(p, struct file, f_u.fu_list);struct dentry * dentry = filp->f_dentry;struct inode * inode;struct file_operations *fops;
fs/super.c +1 -1
@@ -513,7 +513,7 @@struct file *f;file_list_lock (); -list_for_each_entry (f, &sb->s_files, f_list) { +list_for_each_entry (f, &sb->s_files, f_u.fu_list) {if (S_ISREG (f->f_dentry->d_inode->i_mode) &&file_count (f)) f->f_mode &= ~FMODE_WRITE ; }
security/selinux/hooks.c +1 -1
@@ -1599,7 +1599,7 @@if (tty) {file_list_lock (); - file =list_entry (tty->tty_files.next,typeof (*file), f_list); + file =list_entry (tty->tty_files.next,typeof (*file), f_u.fu_list);if (file) {/* Revalidate access to controlling tty. Use inode_has_perm on the tty inode directly rather
security/selinux/selinuxfs.c +1 -1
@@ -924,7 +924,7 @@file_list_lock ();list_for_each (p, &sb->s_files) { - struct file * filp = list_entry(p, struct file, f_list); + struct file * filp = list_entry(p, struct file, f_u.fu_list);struct dentry * dentry = filp->f_dentry;if (dentry->d_parent != de) {
Re: [PATCH] reduce sizeof(struct file)
Quoted 4 lines · Eric Dumazet
include/linux/fs.h +0
-0@@ -574,7 +574,13 @@#define RA_FLAG_INCACHE 0x02/* file is already in cache */
include/linux/fs.h line 583
Quoted 10 lines
include/linux/fs.h +7
-1struct file { -struct list_head f_list; +/* +* f_list and f_rcuhead can share the same memory location +*/ +union { +struct list_head fu_list; +struct rcu_head fu_rcuhead; + } f_u;
I don't think you need to explain this basic C semantic to the reader if they have gotten this far ;)
Instead, explain when fu_list and fu_rcuhead are used. Something along the lines of
/*
* fu_list becomes invalid after file_free is called
* and queued via fu_rcuhead for RCU freeing */
Nick
Signature · 3 lines
SUSE Labs, Novell Inc. Send instant messages to your online friends http://au.messenger.yahoo.com
Re: [PATCH] reduce sizeof(struct file)
In reply to Eric DumazetQuoted 8 lines · Eric Dumazet
Quoted 3 lines · Christoph Hellwig
Please just change all callers to use the union, there's not very many of them.
Yes it's better, thanks Christoph.
What about this version then ?
After a momentary panic attack where I was worried that f_list might be accessed by one CPU while another was sending the same struct file to call_rcu(), I realized that all accesses to f_list do file_list_lock() first, thus preventing any other CPU from doing call_rcu() concurrently on that struct file.
So it looks OK to me.
But you did have me going there for a bit! ;-)
Thanx, Paul
Quoted 175 lines
Hi all
Now that RCU applied on 'struct file' seems stable, we can place
f_rcuheadin a memory location that is not anymore used atcall_rcu(&f->f_rcuhead, file_free_rcu)time, to reduce the size of this critical kernel object.The trick I used is to move
f_rcuheadandf_listin an union calledf_uThe callers are changed so that
f_rcuheadbecomes f_u.fu_rcuhead andf_listbecomes f_u.f_listTested on allyesconfig, diffed against 2.6.14-rc2
drivers/char/tty_io.c | 2 +- fs/dquot.c | 2 +- fs/file_table.c | 14 +++++++------- fs/proc/generic.c | 2 +- fs/super.c | 2 +- include/linux/fs.h | 9 +++++++-- security/selinux/hooks.c | 2 +- security/selinux/selinuxfs.c | 2 +- 8 files changed, 20 insertions(+), 15 deletions(-)Thank you
Signed-off-by Eric Dumazet <[email protected]>include/linux/fs.h +7
-2@@ -574,7 +574,13 @@#define RA_FLAG_INCACHE 0x02/* file is already in cache */ struct file { -struct list_head f_list; +/* +* f_list and f_rcuhead can share the same memory location +*/ +union { +struct list_head fu_list; +struct rcu_head fu_rcuhead; + } f_u;struct dentry *f_dentry;struct vfsmount *f_vfsmnt;struct file_operations *f_op;@@ -598,7 +604,6 @@spinlock_t f_ep_lock;#endif /* #ifdef CONFIG_EPOLL */ struct address_space *f_mapping; -struct rcu_head f_rcuhead; };extern spinlock_t files_lock;#define file_list_lock () spin_lock(&files_lock);fs/file_table.c +7
-7@@ -56,13 +56,13 @@static inline void file_free_rcu (struct rcu_head *head) { - struct file *f = container_of(head, struct file, f_rcuhead); + struct file *f = container_of(head, struct file, f_u.fu_rcuhead);kmem_cache_free (filp_cachep, f); }static inline void file_free (struct file *f) { -call_rcu (&f->f_rcuhead, file_free_rcu); +call_rcu (&f->f_u.fu_rcuhead, file_free_rcu); }/* Find an unused file structure and return a pointer to it. @@ -95,7 +95,7 @@ f->f_gid = current->fsgid;rwlock_init (&f->f_owner.lock);/* f->f_version: 0 */ -INIT_LIST_HEAD (&f->f_list); +INIT_LIST_HEAD (&f->f_u.fu_list);return f; over:@@ -225,15 +225,15 @@if (!list)return ;file_list_lock (); -list_move (&file->f_list, list); +list_move (&file->f_u.fu_list, list);file_list_unlock (); }void file_kill (struct file *file) { -if (!list_empty (&file->f_list)) { +if (!list_empty (&file->f_u.fu_list)) {file_list_lock (); -list_del_init (&file->f_list); +list_del_init (&file->f_u.fu_list);file_list_unlock (); } }@@ -245,7 +245,7 @@/* Check that no files are currently opened for writing. */ file_list_lock ();list_for_each (p, &sb->s_files) { - struct file *file = list_entry(p, struct file, f_list); + struct file *file = list_entry(p, struct file, f_u.fu_list);struct inode *inode = file->f_dentry->d_inode;/* File with pending delete? */ drivers/char/tty_io.c +1
-1@@ -809,7 +809,7 @@check_tty_count (tty,"do_tty_hangup" );file_list_lock ();/* This breaks for file handles being sent over AF_UNIX sockets ? */ -list_for_each_entry (filp, &tty->tty_files, f_list) { +list_for_each_entry (filp, &tty->tty_files, f_u.fu_list) {if (filp->f_op->write == redirected_tty_write) cons_filp = filp;if (filp->f_op->write != tty_write)fs/dquot.c +1
-1@@ -662,7 +662,7 @@ restart:file_list_lock ();list_for_each (p, &sb->s_files) { - struct file *filp = list_entry(p, struct file, f_list); + struct file *filp = list_entry(p, struct file, f_u.fu_list);struct inode *inode = filp->f_dentry->d_inode;if (filp->f_mode &FMODE_WRITE &&dqinit_needed (inode, type)) {struct dentry *dentry =dget (filp->f_dentry);fs/proc/generic.c +1
-1@@ -533,7 +533,7 @@*/ file_list_lock ();list_for_each (p, &sb->s_files) { - struct file * filp = list_entry(p, struct file, f_list); + struct file * filp = list_entry(p, struct file, f_u.fu_list);struct dentry * dentry = filp->f_dentry;struct inode * inode;struct file_operations *fops;fs/super.c +1
-1@@ -513,7 +513,7 @@struct file *f;file_list_lock (); -list_for_each_entry (f, &sb->s_files, f_list) { +list_for_each_entry (f, &sb->s_files, f_u.fu_list) {if (S_ISREG (f->f_dentry->d_inode->i_mode) &&file_count (f)) f->f_mode &= ~FMODE_WRITE ; }security/selinux/hooks.c +1
-1@@ -1599,7 +1599,7 @@if (tty) {file_list_lock (); - file =list_entry (tty->tty_files.next,typeof (*file), f_list); + file =list_entry (tty->tty_files.next,typeof (*file), f_u.fu_list);if (file) {/* Revalidate access to controlling tty. Use inode_has_perm on the tty inode directly rather security/selinux/selinuxfs.c +1
-1@@ -924,7 +924,7 @@file_list_lock ();list_for_each (p, &sb->s_files) { - struct file * filp = list_entry(p, struct file, f_list); + struct file * filp = list_entry(p, struct file, f_u.fu_list);struct dentry * dentry = filp->f_dentry;if (dentry->d_parent != de) {