diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /fs/gfs2/acl.c | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'fs/gfs2/acl.c')
| -rw-r--r-- | fs/gfs2/acl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c index 3e9bd46f27e3..e335dceb6a4f 100644 --- a/fs/gfs2/acl.c +++ b/fs/gfs2/acl.c | |||
| @@ -91,7 +91,7 @@ static int acl_get(struct gfs2_inode *ip, int access, struct posix_acl **acl, | |||
| 91 | struct gfs2_ea_location el_this; | 91 | struct gfs2_ea_location el_this; |
| 92 | int error; | 92 | int error; |
| 93 | 93 | ||
| 94 | if (!ip->i_di.di_eattr) | 94 | if (!ip->i_eattr) |
| 95 | return 0; | 95 | return 0; |
| 96 | 96 | ||
| 97 | memset(&er, 0, sizeof(struct gfs2_ea_request)); | 97 | memset(&er, 0, sizeof(struct gfs2_ea_request)); |