Merge branch 'drivers-platform' into release

[linux-2.6-block.git] / fs / gfs2 / acl.c

diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 3e9bd46f27e322193580f0233b8ca3608b8ca02a..e335dceb6a4ff3f631d51e9069e55aaae0adc382 100644 (file)
--- 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,
        struct gfs2_ea_location el_this;
        int error;
 
-       if (!ip->i_di.di_eattr)
+       if (!ip->i_eattr)
                return 0;
 
        memset(&er, 0, sizeof(struct gfs2_ea_request));