forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into for-next

Browse source 
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
This commit is contained in:
Jiri Kosina 2011-07-11 14:15:48 +02:00
commit b7e9c223be
993 changed files with 34561 additions and 5907 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/linux/fs.h
View file

@ -638,6 +638,7 @@ struct address_space {
struct prio_tree_root i_mmap; /* tree of private and shared mappings */
struct list_head i_mmap_nonlinear;/*list VM_NONLINEAR mappings */
struct mutex i_mmap_mutex; /* protect tree, count, list */
/* Protected by tree_lock together with the radix tree */
unsigned long nrpages; /* number of total pages */
pgoff_t writeback_index;/* writeback starts here */
const struct address_space_operations *a_ops; /* methods */
@ -743,7 +744,7 @@ struct inode {
spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */
unsigned int i_flags;
unsigned int i_state;
unsigned long i_state;
#ifdef CONFIG_SECURITY
void *i_security;
#endif