diff options
| author | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
| commit | bb181e2e48f8c85db08c9cb015cbba9618dbf05c (patch) | |
| tree | 191bc24dd97bcb174535cc217af082f16da3b43d /fs/configfs/dir.c | |
| parent | d57368afe63b3b7b45ce6c2b8c5276417935be2f (diff) | |
| parent | c039c332f23e794deb6d6f37b9f07ff3b27fb2cf (diff) | |
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
Diffstat (limited to 'fs/configfs/dir.c')
| -rw-r--r-- | fs/configfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index 7e6c52d8a207..7414ae24a79b 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c | |||
| @@ -442,7 +442,7 @@ static int configfs_attach_attr(struct configfs_dirent * sd, struct dentry * den | |||
| 442 | 442 | ||
| 443 | static struct dentry * configfs_lookup(struct inode *dir, | 443 | static struct dentry * configfs_lookup(struct inode *dir, |
| 444 | struct dentry *dentry, | 444 | struct dentry *dentry, |
| 445 | struct nameidata *nd) | 445 | unsigned int flags) |
| 446 | { | 446 | { |
| 447 | struct configfs_dirent * parent_sd = dentry->d_parent->d_fsdata; | 447 | struct configfs_dirent * parent_sd = dentry->d_parent->d_fsdata; |
| 448 | struct configfs_dirent * sd; | 448 | struct configfs_dirent * sd; |