diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /fs/inode.c | |
| parent | a8d8f02cf0c379693762107afe812b9e52090e39 (diff) | |
| parent | 9249e17fe094d853d1ef7475dd559a2cc7e23d42 (diff) | |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
Resolve conflicts with the VFS atomic open and sget changes.
Conflicts:
fs/nfs/nfs4proc.c
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c index c99163b1b310..775cbabd4fa5 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -182,7 +182,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode) | |||
| 182 | } | 182 | } |
| 183 | inode->i_private = NULL; | 183 | inode->i_private = NULL; |
| 184 | inode->i_mapping = mapping; | 184 | inode->i_mapping = mapping; |
| 185 | INIT_LIST_HEAD(&inode->i_dentry); /* buggered by rcu freeing */ | 185 | INIT_HLIST_HEAD(&inode->i_dentry); /* buggered by rcu freeing */ |
| 186 | #ifdef CONFIG_FS_POSIX_ACL | 186 | #ifdef CONFIG_FS_POSIX_ACL |
| 187 | inode->i_acl = inode->i_default_acl = ACL_NOT_CACHED; | 187 | inode->i_acl = inode->i_default_acl = ACL_NOT_CACHED; |
| 188 | #endif | 188 | #endif |