diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-02 19:45:47 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-02 19:45:47 -0400 |
| commit | 84695ffee7987ee1e581be4c4696e47e1a29403b (patch) | |
| tree | 78ca09a96ecd6a6b5f4fae744c381968635af68d /fs/f2fs/namei.c | |
| parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff) | |
| parent | ce23e640133484eebc20ca7b7668388213e11327 (diff) | |
Merge getxattr prototype change into work.lookups
The rest of work.xattr stuff isn't needed for this branch
Diffstat (limited to 'fs/f2fs/namei.c')
| -rw-r--r-- | fs/f2fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 013e57932d61..324ed3812f30 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c | |||
| @@ -202,7 +202,7 @@ struct dentry *f2fs_get_parent(struct dentry *child) | |||
| 202 | unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot); | 202 | unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot); |
| 203 | if (!ino) | 203 | if (!ino) |
| 204 | return ERR_PTR(-ENOENT); | 204 | return ERR_PTR(-ENOENT); |
| 205 | return d_obtain_alias(f2fs_iget(d_inode(child)->i_sb, ino)); | 205 | return d_obtain_alias(f2fs_iget(child->d_sb, ino)); |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | static int __recover_dot_dentries(struct inode *dir, nid_t pino) | 208 | static int __recover_dot_dentries(struct inode *dir, nid_t pino) |