diff options
| author | Steve French <sfrench@us.ibm.com> | 2012-01-13 23:59:13 -0600 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2012-01-13 23:59:13 -0600 |
| commit | dcd169b761d52e3f9122e30442b83863bdf1d9d9 (patch) | |
| tree | 5e79741f1865a3aef840e68d7db9e7ed4d685b5a /fs/hppfs/hppfs.c | |
| parent | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (diff) | |
| parent | 7250170c9ed00f3b74b11b98afefab45020672dd (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'fs/hppfs/hppfs.c')
| -rw-r--r-- | fs/hppfs/hppfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c index f590b1160c6c..d92f4ce80925 100644 --- a/fs/hppfs/hppfs.c +++ b/fs/hppfs/hppfs.c @@ -622,7 +622,6 @@ void hppfs_evict_inode(struct inode *ino) static void hppfs_i_callback(struct rcu_head *head) { struct inode *inode = container_of(head, struct inode, i_rcu); - INIT_LIST_HEAD(&inode->i_dentry); kfree(HPPFS_I(inode)); } @@ -726,7 +725,7 @@ static int hppfs_fill_super(struct super_block *sb, void *d, int silent) sb->s_fs_info = proc_mnt; err = -ENOMEM; - root_inode = get_inode(sb, dget(proc_mnt->mnt_sb->s_root)); + root_inode = get_inode(sb, dget(proc_mnt->mnt_root)); if (!root_inode) goto out_mntput; |