On 11/08, Oleg Nesterov wrote: > > On 11/08, Oleg Nesterov wrote: > > > > On 11/08, Stephen Rothwell wrote: > > > > > > Hi Andrew, > > > > > > Today's linux-next merge of the akpm-current tree got a conflict in > > > fs/anon_inodes.c between commit 24b0303e9532 ("take anon inode allocation > > > to libfs.c") from the vfs tree and commit 02f3ac4386d9 ("anon_inodefs: > > > forbid open via /proc") from the akpm-current tree. > > > > > > I just dropped the akpm-current changes for today - they should probably > > > be applied to fs/libfs.c. > > > > Well, this probably means that > > > > anon_inodefs-forbid-open-via-proc.patch > > > > should be dropped. I'll rediff this patch against vfs.git > > 24b0303e9532 also removes anon_inode_fops. It seems that it was not really > needed anyway, inode_init_always() does inode->i_fop = empty_fops... > > So probably we can simply change empty_fops but I need to recheck. Well. It looks "really obvious" that any user of inode_init_always() either needs to change ->i_fop or this file should not be opened via /proc... So, Al, feel free to ignore, this is minor. Still I think this patch makes sense. Based on vfs.git#for-next. Oleg. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html