1 files changed, 7 insertions, 7 deletions

diff --git a/fs/gfs2/eaops.c b/fs/gfs2/eaops.c
index 1c5ac3160b3b..b7e6a37cab6e 100644
--- a/fs/gfs2/eaops.c
+++ b/fs/gfs2/eaops.c
@@ -58,7 +58,7 @@ unsigned int gfs2_ea_name2type(const char *name, char **truncated_name)
 
 static int user_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 {
-        struct inode *inode = ip->i_vnode;
+        struct inode *inode = &ip->i_inode;
         int error = permission(inode, MAY_READ, NULL);
         if (error)
                 return error;
@@ -68,7 +68,7 @@ static int user_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 
 static int user_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 {
-        struct inode *inode = ip->i_vnode;
+        struct inode *inode = &ip->i_inode;
 
         if (S_ISREG(inode->i_mode) ||
             (S_ISDIR(inode->i_mode) && !(inode->i_mode & S_ISVTX))) {
@@ -83,7 +83,7 @@ static int user_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 
 static int user_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 {
-        struct inode *inode = ip->i_vnode;
+        struct inode *inode = &ip->i_inode;
 
         if (S_ISREG(inode->i_mode) ||
             (S_ISDIR(inode->i_mode) && !(inode->i_mode & S_ISVTX))) {
@@ -103,7 +103,7 @@ static int system_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
             !capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        if (ip->i_sbd->sd_args.ar_posix_acl == 0 &&
+        if (GFS2_SB(&ip->i_inode)->sd_args.ar_posix_acl == 0 &&
             (GFS2_ACL_IS_ACCESS(er->er_name, er->er_name_len) ||
              GFS2_ACL_IS_DEFAULT(er->er_name, er->er_name_len)))
                 return -EOPNOTSUPP;
@@ -172,7 +172,7 @@ static int system_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 
 static int security_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 {
-        struct inode *inode = ip->i_vnode;
+        struct inode *inode = &ip->i_inode;
         int error = permission(inode, MAY_READ, NULL);
         if (error)
                 return error;
@@ -182,7 +182,7 @@ static int security_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 
 static int security_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 {
-        struct inode *inode = ip->i_vnode;
+        struct inode *inode = &ip->i_inode;
         int error = permission(inode, MAY_WRITE, NULL);
         if (error)
                 return error;
@@ -192,7 +192,7 @@ static int security_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 
 static int security_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)
 {
-        struct inode *inode = ip->i_vnode;
+        struct inode *inode = &ip->i_inode;
         int error = permission(inode, MAY_WRITE, NULL);
         if (error)
                 return error;