Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 273167
b: refs/heads/master
c: 6cdbb0e
h: refs/heads/master
i:
  273165: 80bf6c6
  273163: 77bc0f6
  273159: 61659c3
  273151: 0c2669f
v: v3
  • Loading branch information
Theodore Ts'o committed Oct 29, 2011
1 parent b078881 commit c6ae42c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 80e675f906db54eb1ce3a9555cee5f45b5b72ab2
refs/heads/master: 6cdbb0effc2f511ced23e46f2117e4b31d3d4a50
10 changes: 5 additions & 5 deletions trunk/include/linux/fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -771,20 +771,20 @@ struct inode {
unsigned long i_ino;
unsigned int i_nlink;
dev_t i_rdev;
loff_t i_size;
struct timespec i_atime;
struct timespec i_mtime;
struct timespec i_ctime;
unsigned int i_blkbits;
spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */
unsigned short i_bytes;
blkcnt_t i_blocks;
loff_t i_size;

#ifdef __NEED_I_SIZE_ORDERED
seqcount_t i_size_seqcount;
#endif

/* Misc */
unsigned long i_state;
spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */
struct mutex i_mutex;

unsigned long dirtied_when; /* jiffies of first dirtying */
Expand All @@ -798,9 +798,10 @@ struct inode {
struct rcu_head i_rcu;
};
atomic_t i_count;
unsigned int i_blkbits;
u64 i_version;
unsigned short i_bytes;
atomic_t i_dio_count;
atomic_t i_writecount;
const struct file_operations *i_fop; /* former ->i_op->default_file_ops */
struct file_lock *i_flock;
struct address_space i_data;
Expand All @@ -824,7 +825,6 @@ struct inode {
#ifdef CONFIG_IMA
atomic_t i_readcount; /* struct files open RO */
#endif
atomic_t i_writecount;
void *i_private; /* fs or device private pointer */
};

Expand Down

0 comments on commit c6ae42c

Please sign in to comment.