Convert ERR_PTR(PTR_ERR(p)) instances to ERR_CAST(p)
[linux-2.6.git] / fs / gfs2 / ops_inode.c
index 9fb9490..e874129 100644 (file)
@@ -1,13 +1,12 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
-#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/mm.h>
 #include <linux/xattr.h>
 #include <linux/posix_acl.h>
-#include <asm/semaphore.h>
+#include <linux/gfs2_ondisk.h>
+#include <linux/crc32.h>
+#include <linux/lm_interface.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
+#include "incore.h"
 #include "acl.h"
 #include "bmap.h"
 #include "dir.h"
 #include "meta_io.h"
 #include "ops_dentry.h"
 #include "ops_inode.h"
-#include "page.h"
 #include "quota.h"
 #include "rgrp.h"
 #include "trans.h"
-#include "unlinked.h"
+#include "util.h"
 
 /**
  * gfs2_create - Create a file
 static int gfs2_create(struct inode *dir, struct dentry *dentry,
                       int mode, struct nameidata *nd)
 {
-       struct gfs2_inode *dip = get_v2ip(dir);
-       struct gfs2_sbd *sdp = dip->i_sbd;
+       struct gfs2_inode *dip = GFS2_I(dir);
+       struct gfs2_sbd *sdp = GFS2_SB(dir);
        struct gfs2_holder ghs[2];
        struct inode *inode;
-       int new = 1;
-       int error;
-
-       atomic_inc(&sdp->sd_ops_inode);
 
        gfs2_holder_init(dip->i_gl, 0, 0, ghs);
 
        for (;;) {
-               inode = gfs2_createi(ghs, &dentry->d_name, S_IFREG | mode);
+               inode = gfs2_createi(ghs, &dentry->d_name, S_IFREG | mode, 0);
                if (!IS_ERR(inode)) {
                        gfs2_trans_end(sdp);
-                       if (dip->i_alloc.al_rgd)
+                       if (dip->i_alloc->al_rgd)
                                gfs2_inplace_release(dip);
                        gfs2_quota_unlock(dip);
                        gfs2_alloc_put(dip);
                        gfs2_glock_dq_uninit_m(2, ghs);
+                       mark_inode_dirty(inode);
                        break;
                } else if (PTR_ERR(inode) != -EEXIST ||
-                          (nd->intent.open.flags & O_EXCL)) {
+                          (nd && (nd->intent.open.flags & O_EXCL))) {
                        gfs2_holder_uninit(ghs);
                        return PTR_ERR(inode);
                }
 
-               error = gfs2_lookupi(dir, &dentry->d_name, 0, &inode);
-               if (!error) {
-                       new = 0;
-                       gfs2_holder_uninit(ghs);
-                       break;
-               } else if (error != -ENOENT) {
-                       gfs2_holder_uninit(ghs);
-                       return error;
+               inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd);
+               if (inode) {
+                       if (!IS_ERR(inode)) {
+                               gfs2_holder_uninit(ghs);
+                               break;
+                       } else {
+                               gfs2_holder_uninit(ghs);
+                               return PTR_ERR(inode);
+                       }
                }
        }
 
        d_instantiate(dentry, inode);
-       if (new)
-               mark_inode_dirty(inode);
 
        return 0;
 }
@@ -108,22 +105,26 @@ static int gfs2_create(struct inode *dir, struct dentry *dentry,
 static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry,
                                  struct nameidata *nd)
 {
-       struct gfs2_inode *dip = get_v2ip(dir);
-       struct gfs2_sbd *sdp = dip->i_sbd;
        struct inode *inode = NULL;
-       int error;
-
-       atomic_inc(&sdp->sd_ops_inode);
 
-       if (!sdp->sd_args.ar_localcaching)
-               dentry->d_op = &gfs2_dops;
+       dentry->d_op = &gfs2_dops;
 
-       error = gfs2_lookupi(dir, &dentry->d_name, 0, &inode);
-       if (error && error != -ENOENT)
-               return ERR_PTR(error);
+       inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd);
+       if (inode && IS_ERR(inode))
+               return ERR_CAST(inode);
 
-       if (inode)
+       if (inode) {
+               struct gfs2_glock *gl = GFS2_I(inode)->i_gl;
+               struct gfs2_holder gh;
+               int error;
+               error = gfs2_glock_nq_init(gl, LM_ST_SHARED, LM_FLAG_ANY, &gh);
+               if (error) {
+                       iput(inode);
+                       return ERR_PTR(error);
+               }
+               gfs2_glock_dq_uninit(&gh);
                return d_splice_alias(inode, dentry);
+       }
        d_add(dentry, inode);
 
        return NULL;
@@ -144,17 +145,15 @@ static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry,
 static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
                     struct dentry *dentry)
 {
-       struct gfs2_inode *dip = get_v2ip(dir);
-       struct gfs2_sbd *sdp = dip->i_sbd;
+       struct gfs2_inode *dip = GFS2_I(dir);
+       struct gfs2_sbd *sdp = GFS2_SB(dir);
        struct inode *inode = old_dentry->d_inode;
-       struct gfs2_inode *ip = get_v2ip(inode);
+       struct gfs2_inode *ip = GFS2_I(inode);
        struct gfs2_holder ghs[2];
        int alloc_required;
        int error;
 
-       atomic_inc(&sdp->sd_ops_inode);
-
-       if (S_ISDIR(ip->i_di.di_mode))
+       if (S_ISDIR(inode->i_mode))
                return -EPERM;
 
        gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
@@ -164,11 +163,11 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
        if (error)
                goto out;
 
-       error = gfs2_repermission(dir, MAY_WRITE | MAY_EXEC, NULL);
+       error = permission(dir, MAY_WRITE | MAY_EXEC, NULL);
        if (error)
                goto out_gunlock;
 
-       error = gfs2_dir_search(dip, &dentry->d_name, NULL, NULL);
+       error = gfs2_dir_check(dir, &dentry->d_name, NULL);
        switch (error) {
        case -ENOENT:
                break;
@@ -179,25 +178,25 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
        }
 
        error = -EINVAL;
-       if (!dip->i_di.di_nlink)
+       if (!dip->i_inode.i_nlink)
                goto out_gunlock;
        error = -EFBIG;
-       if (dip->i_di.di_entries == (uint32_t)-1)
+       if (dip->i_di.di_entries == (u32)-1)
                goto out_gunlock;
        error = -EPERM;
        if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
                goto out_gunlock;
        error = -EINVAL;
-       if (!ip->i_di.di_nlink)
+       if (!ip->i_inode.i_nlink)
                goto out_gunlock;
        error = -EMLINK;
-       if (ip->i_di.di_nlink == (uint32_t)-1)
+       if (ip->i_inode.i_nlink == (u32)-1)
                goto out_gunlock;
 
-       error = gfs2_diradd_alloc_required(dip, &dentry->d_name,
-                                          &alloc_required);
-       if (error)
+       alloc_required = error = gfs2_diradd_alloc_required(dir, &dentry->d_name);
+       if (error < 0)
                goto out_gunlock;
+       error = 0;
 
        if (alloc_required) {
                struct gfs2_alloc *al = gfs2_alloc_get(dip);
@@ -206,8 +205,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
                if (error)
                        goto out_alloc;
 
-               error = gfs2_quota_check(dip, dip->i_di.di_uid,
-                                        dip->i_di.di_gid);
+               error = gfs2_quota_check(dip, dip->i_inode.i_uid, dip->i_inode.i_gid);
                if (error)
                        goto out_gunlock_q;
 
@@ -217,9 +215,8 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
                if (error)
                        goto out_gunlock_q;
 
-               error = gfs2_trans_begin(sdp,
-                                        sdp->sd_max_dirres +
-                                        al->al_rgd->rd_ri.ri_length +
+               error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +
+                                        al->al_rgd->rd_length +
                                         2 * RES_DINODE + RES_STATFS +
                                         RES_QUOTA, 0);
                if (error)
@@ -230,41 +227,33 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
                        goto out_ipres;
        }
 
-       error = gfs2_dir_add(dip, &dentry->d_name, &ip->i_num,
-                            IF2DT(ip->i_di.di_mode));
+       error = gfs2_dir_add(dir, &dentry->d_name, ip, IF2DT(inode->i_mode));
        if (error)
                goto out_end_trans;
 
        error = gfs2_change_nlink(ip, +1);
 
- out_end_trans:
+out_end_trans:
        gfs2_trans_end(sdp);
-
- out_ipres:
+out_ipres:
        if (alloc_required)
                gfs2_inplace_release(dip);
-
- out_gunlock_q:
+out_gunlock_q:
        if (alloc_required)
                gfs2_quota_unlock(dip);
-
- out_alloc:
+out_alloc:
        if (alloc_required)
                gfs2_alloc_put(dip);
-
- out_gunlock:
+out_gunlock:
        gfs2_glock_dq_m(2, ghs);
-
- out:
+out:
        gfs2_holder_uninit(ghs);
        gfs2_holder_uninit(ghs + 1);
-
        if (!error) {
                atomic_inc(&inode->i_count);
                d_instantiate(dentry, inode);
                mark_inode_dirty(inode);
        }
-
        return error;
 }
 
@@ -280,48 +269,63 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
 
 static int gfs2_unlink(struct inode *dir, struct dentry *dentry)
 {
-       struct gfs2_inode *dip = get_v2ip(dir);
-       struct gfs2_sbd *sdp = dip->i_sbd;
-       struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
-       struct gfs2_unlinked *ul;
-       struct gfs2_holder ghs[2];
+       struct gfs2_inode *dip = GFS2_I(dir);
+       struct gfs2_sbd *sdp = GFS2_SB(dir);
+       struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
+       struct gfs2_holder ghs[3];
+       struct gfs2_rgrpd *rgd;
+       struct gfs2_holder ri_gh;
        int error;
 
-       atomic_inc(&sdp->sd_ops_inode);
-
-       error = gfs2_unlinked_get(sdp, &ul);
+       error = gfs2_rindex_hold(sdp, &ri_gh);
        if (error)
                return error;
 
        gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
-       gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 1);
+       gfs2_holder_init(ip->i_gl,  LM_ST_EXCLUSIVE, 0, ghs + 1);
 
-       error = gfs2_glock_nq_m(2, ghs);
-       if (error)
-               goto out;
+       rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr);
+       gfs2_holder_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, ghs + 2);
 
-       error = gfs2_unlink_ok(dip, &dentry->d_name, ip);
+
+       error = gfs2_glock_nq(ghs); /* parent */
        if (error)
-               goto out_gunlock;
+               goto out_parent;
 
-       error = gfs2_trans_begin(sdp, 2 * RES_DINODE + RES_LEAF +
-                               RES_UNLINKED, 0);
+       error = gfs2_glock_nq(ghs + 1); /* child */
        if (error)
-               goto out_gunlock;
+               goto out_child;
 
-       error = gfs2_unlinki(dip, &dentry->d_name, ip,ul);
+       error = gfs2_glock_nq(ghs + 2); /* rgrp */
+       if (error)
+               goto out_rgrp;
 
-       gfs2_trans_end(sdp);
+       error = gfs2_unlink_ok(dip, &dentry->d_name, ip);
+       if (error)
+               goto out_rgrp;
 
- out_gunlock:
-       gfs2_glock_dq_m(2, ghs);
+       error = gfs2_trans_begin(sdp, 2*RES_DINODE + RES_LEAF + RES_RG_BIT, 0);
+       if (error)
+               goto out_rgrp;
 
- out:
-       gfs2_holder_uninit(ghs);
-       gfs2_holder_uninit(ghs + 1);
+       error = gfs2_dir_del(dip, &dentry->d_name);
+        if (error)
+                goto out_end_trans;
 
-       gfs2_unlinked_put(sdp, ul);
+       error = gfs2_change_nlink(ip, -1);
 
+out_end_trans:
+       gfs2_trans_end(sdp);
+       gfs2_glock_dq(ghs + 2);
+out_rgrp:
+       gfs2_holder_uninit(ghs + 2);
+       gfs2_glock_dq(ghs + 1);
+out_child:
+       gfs2_holder_uninit(ghs + 1);
+       gfs2_glock_dq(ghs);
+out_parent:
+       gfs2_holder_uninit(ghs);
+       gfs2_glock_dq_uninit(&ri_gh);
        return error;
 }
 
@@ -337,16 +341,14 @@ static int gfs2_unlink(struct inode *dir, struct dentry *dentry)
 static int gfs2_symlink(struct inode *dir, struct dentry *dentry,
                        const char *symname)
 {
-       struct gfs2_inode *dip = get_v2ip(dir), *ip;
-       struct gfs2_sbd *sdp = dip->i_sbd;
+       struct gfs2_inode *dip = GFS2_I(dir), *ip;
+       struct gfs2_sbd *sdp = GFS2_SB(dir);
        struct gfs2_holder ghs[2];
        struct inode *inode;
        struct buffer_head *dibh;
        int size;
        int error;
 
-       atomic_inc(&sdp->sd_ops_inode);
-
        /* Must be stuffed with a null terminator for gfs2_follow_link() */
        size = strlen(symname);
        if (size > sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode) - 1)
@@ -354,27 +356,27 @@ static int gfs2_symlink(struct inode *dir, struct dentry *dentry,
 
        gfs2_holder_init(dip->i_gl, 0, 0, ghs);
 
-       inode = gfs2_createi(ghs, &dentry->d_name, S_IFLNK | S_IRWXUGO);
+       inode = gfs2_createi(ghs, &dentry->d_name, S_IFLNK | S_IRWXUGO, 0);
        if (IS_ERR(inode)) {
                gfs2_holder_uninit(ghs);
                return PTR_ERR(inode);
        }
 
-       ip = get_gl2ip(ghs[1].gh_gl);
+       ip = ghs[1].gh_gl->gl_object;
 
        ip->i_di.di_size = size;
 
        error = gfs2_meta_inode_buffer(ip, &dibh);
 
        if (!gfs2_assert_withdraw(sdp, !error)) {
-               gfs2_dinode_out(&ip->i_di, dibh->b_data);
+               gfs2_dinode_out(ip, dibh->b_data);
                memcpy(dibh->b_data + sizeof(struct gfs2_dinode), symname,
                       size);
                brelse(dibh);
        }
 
        gfs2_trans_end(sdp);
-       if (dip->i_alloc.al_rgd)
+       if (dip->i_alloc->al_rgd)
                gfs2_inplace_release(dip);
        gfs2_quota_unlock(dip);
        gfs2_alloc_put(dip);
@@ -398,55 +400,50 @@ static int gfs2_symlink(struct inode *dir, struct dentry *dentry,
 
 static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
-       struct gfs2_inode *dip = get_v2ip(dir), *ip;
-       struct gfs2_sbd *sdp = dip->i_sbd;
+       struct gfs2_inode *dip = GFS2_I(dir), *ip;
+       struct gfs2_sbd *sdp = GFS2_SB(dir);
        struct gfs2_holder ghs[2];
        struct inode *inode;
        struct buffer_head *dibh;
        int error;
 
-       atomic_inc(&sdp->sd_ops_inode);
-
        gfs2_holder_init(dip->i_gl, 0, 0, ghs);
 
-       inode = gfs2_createi(ghs, &dentry->d_name, S_IFDIR | mode);
+       inode = gfs2_createi(ghs, &dentry->d_name, S_IFDIR | mode, 0);
        if (IS_ERR(inode)) {
                gfs2_holder_uninit(ghs);
                return PTR_ERR(inode);
        }
 
-       ip = get_gl2ip(ghs[1].gh_gl);
+       ip = ghs[1].gh_gl->gl_object;
 
-       ip->i_di.di_nlink = 2;
+       ip->i_inode.i_nlink = 2;
        ip->i_di.di_size = sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode);
        ip->i_di.di_flags |= GFS2_DIF_JDATA;
-       ip->i_di.di_payload_format = GFS2_FORMAT_DE;
        ip->i_di.di_entries = 2;
 
        error = gfs2_meta_inode_buffer(ip, &dibh);
 
        if (!gfs2_assert_withdraw(sdp, !error)) {
                struct gfs2_dinode *di = (struct gfs2_dinode *)dibh->b_data;
-               struct gfs2_dirent *dent;
-
-               gfs2_dirent_alloc(ip, dibh, 1, &dent);
+               struct gfs2_dirent *dent = (struct gfs2_dirent *)(di+1);
+               struct qstr str;
 
+               gfs2_str2qstr(&str, ".");
+               gfs2_trans_add_bh(ip->i_gl, dibh, 1);
+               gfs2_qstr2dirent(&str, GFS2_DIRENT_SIZE(str.len), dent);
                dent->de_inum = di->di_num; /* already GFS2 endian */
-               dent->de_hash = gfs2_disk_hash(".", 1);
-               dent->de_hash = cpu_to_be32(dent->de_hash);
-               dent->de_type = DT_DIR;
-               memcpy((char *) (dent + 1), ".", 1);
+               dent->de_type = cpu_to_be16(DT_DIR);
                di->di_entries = cpu_to_be32(1);
 
-               gfs2_dirent_alloc(ip, dibh, 2, &dent);
+               gfs2_str2qstr(&str, "..");
+               dent = (struct gfs2_dirent *)((char*)dent + GFS2_DIRENT_SIZE(1));
+               gfs2_qstr2dirent(&str, dibh->b_size - GFS2_DIRENT_SIZE(1) - sizeof(struct gfs2_dinode), dent);
 
-               gfs2_inum_out(&dip->i_num, (char *) &dent->de_inum);
-               dent->de_hash = gfs2_disk_hash("..", 2);
-               dent->de_hash = cpu_to_be32(dent->de_hash);
-               dent->de_type = DT_DIR;
-               memcpy((char *) (dent + 1), "..", 2);
+               gfs2_inum_out(dip, dent);
+               dent->de_type = cpu_to_be16(DT_DIR);
 
-               gfs2_dinode_out(&ip->i_di, (char *)di);
+               gfs2_dinode_out(ip, di);
 
                brelse(dibh);
        }
@@ -455,7 +452,7 @@ static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        gfs2_assert_withdraw(sdp, !error); /* dip already pinned */
 
        gfs2_trans_end(sdp);
-       if (dip->i_alloc.al_rgd)
+       if (dip->i_alloc->al_rgd)
                gfs2_inplace_release(dip);
        gfs2_quota_unlock(dip);
        gfs2_alloc_put(dip);
@@ -480,23 +477,25 @@ static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 
 static int gfs2_rmdir(struct inode *dir, struct dentry *dentry)
 {
-       struct gfs2_inode *dip = get_v2ip(dir);
-       struct gfs2_sbd *sdp = dip->i_sbd;
-       struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
-       struct gfs2_unlinked *ul;
-       struct gfs2_holder ghs[2];
+       struct gfs2_inode *dip = GFS2_I(dir);
+       struct gfs2_sbd *sdp = GFS2_SB(dir);
+       struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
+       struct gfs2_holder ghs[3];
+       struct gfs2_rgrpd *rgd;
+       struct gfs2_holder ri_gh;
        int error;
 
-       atomic_inc(&sdp->sd_ops_inode);
 
-       error = gfs2_unlinked_get(sdp, &ul);
+       error = gfs2_rindex_hold(sdp, &ri_gh);
        if (error)
                return error;
-
        gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
        gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 1);
 
-       error = gfs2_glock_nq_m(2, ghs);
+       rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr);
+       gfs2_holder_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, ghs + 2);
+
+       error = gfs2_glock_nq_m(3, ghs);
        if (error)
                goto out;
 
@@ -506,7 +505,7 @@ static int gfs2_rmdir(struct inode *dir, struct dentry *dentry)
 
        if (ip->i_di.di_entries < 2) {
                if (gfs2_consist_inode(ip))
-                       gfs2_dinode_print(&ip->i_di);
+                       gfs2_dinode_print(ip);
                error = -EIO;
                goto out_gunlock;
        }
@@ -515,24 +514,21 @@ static int gfs2_rmdir(struct inode *dir, struct dentry *dentry)
                goto out_gunlock;
        }
 
-       error = gfs2_trans_begin(sdp, 2 * RES_DINODE + 3 * RES_LEAF +
-                               RES_UNLINKED, 0);
+       error = gfs2_trans_begin(sdp, 2 * RES_DINODE + 3 * RES_LEAF + RES_RG_BIT, 0);
        if (error)
                goto out_gunlock;
 
-       error = gfs2_rmdiri(dip, &dentry->d_name, ip, ul);
+       error = gfs2_rmdiri(dip, &dentry->d_name, ip);
 
        gfs2_trans_end(sdp);
 
- out_gunlock:
-       gfs2_glock_dq_m(2, ghs);
-
- out:
+out_gunlock:
+       gfs2_glock_dq_m(3, ghs);
+out:
        gfs2_holder_uninit(ghs);
        gfs2_holder_uninit(ghs + 1);
-
-       gfs2_unlinked_put(sdp, ul);
-
+       gfs2_holder_uninit(ghs + 2);
+       gfs2_glock_dq_uninit(&ri_gh);
        return error;
 }
 
@@ -548,51 +544,21 @@ static int gfs2_rmdir(struct inode *dir, struct dentry *dentry)
 static int gfs2_mknod(struct inode *dir, struct dentry *dentry, int mode,
                      dev_t dev)
 {
-       struct gfs2_inode *dip = get_v2ip(dir), *ip;
-       struct gfs2_sbd *sdp = dip->i_sbd;
+       struct gfs2_inode *dip = GFS2_I(dir);
+       struct gfs2_sbd *sdp = GFS2_SB(dir);
        struct gfs2_holder ghs[2];
        struct inode *inode;
-       struct buffer_head *dibh;
-       uint32_t major = 0, minor = 0;
-       int error;
-
-       atomic_inc(&sdp->sd_ops_inode);
-
-       switch (mode & S_IFMT) {
-       case S_IFBLK:
-       case S_IFCHR:
-               major = MAJOR(dev);
-               minor = MINOR(dev);
-               break;
-       case S_IFIFO:
-       case S_IFSOCK:
-               break;
-       default:
-               return -EOPNOTSUPP;             
-       };
 
        gfs2_holder_init(dip->i_gl, 0, 0, ghs);
 
-       inode = gfs2_createi(ghs, &dentry->d_name, mode);
+       inode = gfs2_createi(ghs, &dentry->d_name, mode, dev);
        if (IS_ERR(inode)) {
                gfs2_holder_uninit(ghs);
                return PTR_ERR(inode);
        }
 
-       ip = get_gl2ip(ghs[1].gh_gl);
-
-       ip->i_di.di_major = major;
-       ip->i_di.di_minor = minor;
-
-       error = gfs2_meta_inode_buffer(ip, &dibh);
-
-       if (!gfs2_assert_withdraw(sdp, !error)) {
-               gfs2_dinode_out(&ip->i_di, dibh->b_data);
-               brelse(dibh);
-       }
-
        gfs2_trans_end(sdp);
-       if (dip->i_alloc.al_rgd)
+       if (dip->i_alloc->al_rgd)
                gfs2_inplace_release(dip);
        gfs2_quota_unlock(dip);
        gfs2_alloc_put(dip);
@@ -618,38 +584,31 @@ static int gfs2_mknod(struct inode *dir, struct dentry *dentry, int mode,
 static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                       struct inode *ndir, struct dentry *ndentry)
 {
-       struct gfs2_inode *odip = get_v2ip(odir);
-       struct gfs2_inode *ndip = get_v2ip(ndir);
-       struct gfs2_inode *ip = get_v2ip(odentry->d_inode);
+       struct gfs2_inode *odip = GFS2_I(odir);
+       struct gfs2_inode *ndip = GFS2_I(ndir);
+       struct gfs2_inode *ip = GFS2_I(odentry->d_inode);
        struct gfs2_inode *nip = NULL;
-       struct gfs2_sbd *sdp = odip->i_sbd;
-       struct gfs2_unlinked *ul;
-       struct gfs2_holder ghs[4], r_gh;
+       struct gfs2_sbd *sdp = GFS2_SB(odir);
+       struct gfs2_holder ghs[5], r_gh;
+       struct gfs2_rgrpd *nrgd;
        unsigned int num_gh;
        int dir_rename = 0;
        int alloc_required;
        unsigned int x;
        int error;
 
-       atomic_inc(&sdp->sd_ops_inode);
-
        if (ndentry->d_inode) {
-               nip = get_v2ip(ndentry->d_inode);
+               nip = GFS2_I(ndentry->d_inode);
                if (ip == nip)
                        return 0;
        }
 
-       error = gfs2_unlinked_get(sdp, &ul);
-       if (error)
-               return error;
-
        /* Make sure we aren't trying to move a dirctory into it's subdir */
 
-       if (S_ISDIR(ip->i_di.di_mode) && odip != ndip) {
+       if (S_ISDIR(ip->i_inode.i_mode) && odip != ndip) {
                dir_rename = 1;
 
-               error = gfs2_glock_nq_init(sdp->sd_rename_gl,
-                                          LM_ST_EXCLUSIVE, 0,
+               error = gfs2_glock_nq_init(sdp->sd_rename_gl, LM_ST_EXCLUSIVE, 0,
                                           &r_gh);
                if (error)
                        goto out;
@@ -659,13 +618,26 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                        goto out_gunlock_r;
        }
 
+       num_gh = 1;
        gfs2_holder_init(odip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
-       gfs2_holder_init(ndip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 1);
-       gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 2);
-       num_gh = 3;
+       if (odip != ndip) {
+               gfs2_holder_init(ndip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh);
+               num_gh++;
+       }
+       gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh);
+       num_gh++;
 
-       if (nip)
-               gfs2_holder_init(nip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh++);
+       if (nip) {
+               gfs2_holder_init(nip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh);
+               num_gh++;
+               /* grab the resource lock for unlink flag twiddling 
+                * this is the case of the target file already existing
+                * so we unlink before doing the rename
+                */
+               nrgd = gfs2_blk2rgrpd(sdp, nip->i_no_addr);
+               if (nrgd)
+                       gfs2_holder_init(nrgd->rd_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh++);
+       }
 
        error = gfs2_glock_nq_m(num_gh, ghs);
        if (error)
@@ -684,10 +656,10 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                if (error)
                        goto out_gunlock;
 
-               if (S_ISDIR(nip->i_di.di_mode)) {
+               if (S_ISDIR(nip->i_inode.i_mode)) {
                        if (nip->i_di.di_entries < 2) {
                                if (gfs2_consist_inode(nip))
-                                       gfs2_dinode_print(&nip->i_di);
+                                       gfs2_dinode_print(nip);
                                error = -EIO;
                                goto out_gunlock;
                        }
@@ -697,11 +669,11 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                        }
                }
        } else {
-               error = gfs2_repermission(ndir, MAY_WRITE | MAY_EXEC, NULL);
+               error = permission(ndir, MAY_WRITE | MAY_EXEC, NULL);
                if (error)
                        goto out_gunlock;
 
-               error = gfs2_dir_search(ndip, &ndentry->d_name, NULL, NULL);
+               error = gfs2_dir_check(ndir, &ndentry->d_name, NULL);
                switch (error) {
                case -ENOENT:
                        error = 0;
@@ -713,16 +685,16 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                };
 
                if (odip != ndip) {
-                       if (!ndip->i_di.di_nlink) {
+                       if (!ndip->i_inode.i_nlink) {
                                error = -EINVAL;
                                goto out_gunlock;
                        }
-                       if (ndip->i_di.di_entries == (uint32_t)-1) {
+                       if (ndip->i_di.di_entries == (u32)-1) {
                                error = -EFBIG;
                                goto out_gunlock;
                        }
-                       if (S_ISDIR(ip->i_di.di_mode) &&
-                           ndip->i_di.di_nlink == (uint32_t)-1) {
+                       if (S_ISDIR(ip->i_inode.i_mode) &&
+                           ndip->i_inode.i_nlink == (u32)-1) {
                                error = -EMLINK;
                                goto out_gunlock;
                        }
@@ -732,15 +704,15 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
        /* Check out the dir to be renamed */
 
        if (dir_rename) {
-               error = gfs2_repermission(odentry->d_inode, MAY_WRITE, NULL);
+               error = permission(odentry->d_inode, MAY_WRITE, NULL);
                if (error)
                        goto out_gunlock;
        }
 
-       error = gfs2_diradd_alloc_required(ndip, &ndentry->d_name,
-                                          &alloc_required);
-       if (error)
+       alloc_required = error = gfs2_diradd_alloc_required(ndir, &ndentry->d_name);
+       if (error < 0)
                goto out_gunlock;
+       error = 0;
 
        if (alloc_required) {
                struct gfs2_alloc *al = gfs2_alloc_get(ndip);
@@ -749,8 +721,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                if (error)
                        goto out_alloc;
 
-               error = gfs2_quota_check(ndip, ndip->i_di.di_uid,
-                                        ndip->i_di.di_gid);
+               error = gfs2_quota_check(ndip, ndip->i_inode.i_uid, ndip->i_inode.i_gid);
                if (error)
                        goto out_gunlock_q;
 
@@ -760,18 +731,15 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                if (error)
                        goto out_gunlock_q;
 
-               error = gfs2_trans_begin(sdp,
-                                        sdp->sd_max_dirres +
-                                        al->al_rgd->rd_ri.ri_length +
+               error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +
+                                        al->al_rgd->rd_length +
                                         4 * RES_DINODE + 4 * RES_LEAF +
-                                        RES_UNLINKED + RES_STATFS +
-                                        RES_QUOTA, 0);
+                                        RES_STATFS + RES_QUOTA + 4, 0);
                if (error)
                        goto out_ipreserv;
        } else {
                error = gfs2_trans_begin(sdp, 4 * RES_DINODE +
-                                        5 * RES_LEAF +
-                                        RES_UNLINKED, 0);
+                                        5 * RES_LEAF + 4, 0);
                if (error)
                        goto out_gunlock;
        }
@@ -779,18 +747,21 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
        /* Remove the target file, if it exists */
 
        if (nip) {
-               if (S_ISDIR(nip->i_di.di_mode))
-                       error = gfs2_rmdiri(ndip, &ndentry->d_name, nip, ul);
-               else
-                       error = gfs2_unlinki(ndip, &ndentry->d_name, nip, ul);
+               if (S_ISDIR(nip->i_inode.i_mode))
+                       error = gfs2_rmdiri(ndip, &ndentry->d_name, nip);
+               else {
+                       error = gfs2_dir_del(ndip, &ndentry->d_name);
+                       if (error)
+                               goto out_end_trans;
+                       error = gfs2_change_nlink(nip, -1);
+               }
                if (error)
                        goto out_end_trans;
        }
 
        if (dir_rename) {
                struct qstr name;
-               name.len = 2;
-               name.name = "..";
+               gfs2_str2qstr(&name, "..");
 
                error = gfs2_change_nlink(ndip, +1);
                if (error)
@@ -799,7 +770,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                if (error)
                        goto out_end_trans;
 
-               error = gfs2_dir_mvino(ip, &name, &ndip->i_num, DT_DIR);
+               error = gfs2_dir_mvino(ip, &name, ndip, DT_DIR);
                if (error)
                        goto out_end_trans;
        } else {
@@ -807,9 +778,9 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                error = gfs2_meta_inode_buffer(ip, &dibh);
                if (error)
                        goto out_end_trans;
-               ip->i_di.di_ctime = get_seconds();
+               ip->i_inode.i_ctime = CURRENT_TIME;
                gfs2_trans_add_bh(ip->i_gl, dibh, 1);
-               gfs2_dinode_out(&ip->i_di, dibh->b_data);
+               gfs2_dinode_out(ip, dibh->b_data);
                brelse(dibh);
        }
 
@@ -817,40 +788,30 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
        if (error)
                goto out_end_trans;
 
-       error = gfs2_dir_add(ndip, &ndentry->d_name, &ip->i_num,
-                            IF2DT(ip->i_di.di_mode));
+       error = gfs2_dir_add(ndir, &ndentry->d_name, ip, IF2DT(ip->i_inode.i_mode));
        if (error)
                goto out_end_trans;
 
- out_end_trans:
+out_end_trans:
        gfs2_trans_end(sdp);
-
- out_ipreserv:
+out_ipreserv:
        if (alloc_required)
                gfs2_inplace_release(ndip);
-
- out_gunlock_q:
+out_gunlock_q:
        if (alloc_required)
                gfs2_quota_unlock(ndip);
-
- out_alloc:
+out_alloc:
        if (alloc_required)
                gfs2_alloc_put(ndip);
-
- out_gunlock:
+out_gunlock:
        gfs2_glock_dq_m(num_gh, ghs);
-
- out_uninit:
+out_uninit:
        for (x = 0; x < num_gh; x++)
                gfs2_holder_uninit(ghs + x);
-
- out_gunlock_r:
+out_gunlock_r:
        if (dir_rename)
                gfs2_glock_dq_uninit(&r_gh);
-
- out:
-       gfs2_unlinked_put(sdp, ul);
-
+out:
        return error;
 }
 
@@ -866,13 +827,11 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
 static int gfs2_readlink(struct dentry *dentry, char __user *user_buf,
                         int user_size)
 {
-       struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
+       struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
        char array[GFS2_FAST_NAME_SIZE], *buf = array;
        unsigned int len = GFS2_FAST_NAME_SIZE;
        int error;
 
-       atomic_inc(&ip->i_sbd->sd_ops_inode);
-
        error = gfs2_readlinki(ip, &buf, &len);
        if (error)
                return error;
@@ -904,13 +863,11 @@ static int gfs2_readlink(struct dentry *dentry, char __user *user_buf,
 
 static void *gfs2_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-       struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
+       struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
        char array[GFS2_FAST_NAME_SIZE], *buf = array;
        unsigned int len = GFS2_FAST_NAME_SIZE;
        int error;
 
-       atomic_inc(&ip->i_sbd->sd_ops_inode);
-
        error = gfs2_readlinki(ip, &buf, &len);
        if (!error) {
                error = vfs_follow_link(nd, buf);
@@ -927,59 +884,67 @@ static void *gfs2_follow_link(struct dentry *dentry, struct nameidata *nd)
  * @mask:
  * @nd: passed from Linux VFS, ignored by us
  *
+ * This may be called from the VFS directly, or from within GFS2 with the
+ * inode locked, so we look to see if the glock is already locked and only
+ * lock the glock if its not already been done.
+ *
  * Returns: errno
  */
 
 static int gfs2_permission(struct inode *inode, int mask, struct nameidata *nd)
 {
-       struct gfs2_inode *ip = get_v2ip(inode);
+       struct gfs2_inode *ip = GFS2_I(inode);
        struct gfs2_holder i_gh;
        int error;
+       int unlock = 0;
 
-       atomic_inc(&ip->i_sbd->sd_ops_inode);
-
-       if (ip->i_vn == ip->i_gl->gl_vn)
-               return generic_permission(inode, mask, gfs2_check_acl);
+       if (gfs2_glock_is_locked_by_me(ip->i_gl) == 0) {
+               error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh);
+               if (error)
+                       return error;
+               unlock = 1;
+       }
 
-       error = gfs2_glock_nq_init(ip->i_gl,
-                                  LM_ST_SHARED, LM_FLAG_ANY,
-                                  &i_gh);
-       if (!error) {
-               error = generic_permission(inode, mask, gfs2_check_acl_locked);
+       error = generic_permission(inode, mask, gfs2_check_acl);
+       if (unlock)
                gfs2_glock_dq_uninit(&i_gh);
-       }
 
        return error;
 }
 
 static int setattr_size(struct inode *inode, struct iattr *attr)
 {
-       struct gfs2_inode *ip = get_v2ip(inode);
+       struct gfs2_inode *ip = GFS2_I(inode);
+       struct gfs2_sbd *sdp = GFS2_SB(inode);
        int error;
 
        if (attr->ia_size != ip->i_di.di_size) {
-               error = vmtruncate(inode, attr->ia_size);
+               error = gfs2_trans_begin(sdp, 0, sdp->sd_jdesc->jd_blocks);
                if (error)
                        return error;
+               error = vmtruncate(inode, attr->ia_size);
+               gfs2_trans_end(sdp);
+               if (error) 
+                       return error;
        }
 
        error = gfs2_truncatei(ip, attr->ia_size);
-       if (error)
-               return error;
+       if (error && (inode->i_size != ip->i_di.di_size))
+               i_size_write(inode, ip->i_di.di_size);
 
        return error;
 }
 
 static int setattr_chown(struct inode *inode, struct iattr *attr)
 {
-       struct gfs2_inode *ip = get_v2ip(inode);
-       struct gfs2_sbd *sdp = ip->i_sbd;
+       struct gfs2_inode *ip = GFS2_I(inode);
+       struct gfs2_sbd *sdp = GFS2_SB(inode);
        struct buffer_head *dibh;
-       uint32_t ouid, ogid, nuid, ngid;
+       u32 ouid, ogid, nuid, ngid;
        int error;
 
-       ouid = ip->i_di.di_uid;
-       ogid = ip->i_di.di_gid;
+       ouid = inode->i_uid;
+       ogid = inode->i_gid;
        nuid = attr->ia_uid;
        ngid = attr->ia_gid;
 
@@ -1010,28 +975,22 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
 
        error = inode_setattr(inode, attr);
        gfs2_assert_warn(sdp, !error);
-       gfs2_inode_attr_out(ip);
 
        gfs2_trans_add_bh(ip->i_gl, dibh, 1);
-       gfs2_dinode_out(&ip->i_di, dibh->b_data);
+       gfs2_dinode_out(ip, dibh->b_data);
        brelse(dibh);
 
        if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) {
-               gfs2_quota_change(ip, -ip->i_di.di_blocks,
-                                ouid, ogid);
-               gfs2_quota_change(ip, ip->i_di.di_blocks,
-                                nuid, ngid);
+               gfs2_quota_change(ip, -ip->i_di.di_blocks, ouid, ogid);
+               gfs2_quota_change(ip, ip->i_di.di_blocks, nuid, ngid);
        }
 
- out_end_trans:
+out_end_trans:
        gfs2_trans_end(sdp);
-
- out_gunlock_q:
+out_gunlock_q:
        gfs2_quota_unlock(ip);
-
- out_alloc:
+out_alloc:
        gfs2_alloc_put(ip);
-
        return error;
 }
 
@@ -1049,12 +1008,10 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
 static int gfs2_setattr(struct dentry *dentry, struct iattr *attr)
 {
        struct inode *inode = dentry->d_inode;
-       struct gfs2_inode *ip = get_v2ip(inode);
+       struct gfs2_inode *ip = GFS2_I(inode);
        struct gfs2_holder i_gh;
        int error;
 
-       atomic_inc(&ip->i_sbd->sd_ops_inode);
-
        error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &i_gh);
        if (error)
                return error;
@@ -1076,21 +1033,25 @@ static int gfs2_setattr(struct dentry *dentry, struct iattr *attr)
        else
                error = gfs2_setattr_simple(ip, attr);
 
- out:
+out:
        gfs2_glock_dq_uninit(&i_gh);
-
        if (!error)
                mark_inode_dirty(inode);
-
        return error;
 }
 
 /**
  * gfs2_getattr - Read out an inode's attributes
- * @mnt: ?
+ * @mnt: The vfsmount the inode is being accessed from
  * @dentry: The dentry to stat
  * @stat: The inode's stats
  *
+ * This may be called from the VFS directly, or from within GFS2 with the
+ * inode locked, so we look to see if the glock is already locked and only
+ * lock the glock if its not already been done. Note that its the NFS
+ * readdirplus operation which causes this to be called (from filldir)
+ * with the glock already held.
+ *
  * Returns: errno
  */
 
@@ -1098,29 +1059,31 @@ static int gfs2_getattr(struct vfsmount *mnt, struct dentry *dentry,
                        struct kstat *stat)
 {
        struct inode *inode = dentry->d_inode;
-       struct gfs2_inode *ip = get_v2ip(inode);
+       struct gfs2_inode *ip = GFS2_I(inode);
        struct gfs2_holder gh;
        int error;
+       int unlock = 0;
 
-       atomic_inc(&ip->i_sbd->sd_ops_inode);
+       if (gfs2_glock_is_locked_by_me(ip->i_gl) == 0) {
+               error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &gh);
+               if (error)
+                       return error;
+               unlock = 1;
+       }
 
-       error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &gh);
-       if (!error) {
-               generic_fillattr(inode, stat);
+       generic_fillattr(inode, stat);
+       if (unlock)
                gfs2_glock_dq_uninit(&gh);
-       }
 
-       return error;
+       return 0;
 }
 
 static int gfs2_setxattr(struct dentry *dentry, const char *name,
                         const void *data, size_t size, int flags)
 {
-       struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
+       struct inode *inode = dentry->d_inode;
        struct gfs2_ea_request er;
 
-       atomic_inc(&ip->i_sbd->sd_ops_inode);
-
        memset(&er, 0, sizeof(struct gfs2_ea_request));
        er.er_type = gfs2_ea_name2type(name, &er.er_name);
        if (er.er_type == GFS2_EATYPE_UNUSED)
@@ -1130,9 +1093,9 @@ static int gfs2_setxattr(struct dentry *dentry, const char *name,
        er.er_data_len = size;
        er.er_flags = flags;
 
-       gfs2_assert_warn(ip->i_sbd, !(er.er_flags & GFS2_ERF_MODE));
+       gfs2_assert_warn(GFS2_SB(inode), !(er.er_flags & GFS2_ERF_MODE));
 
-       return gfs2_ea_set(ip, &er);
+       return gfs2_ea_set(GFS2_I(inode), &er);
 }
 
 static ssize_t gfs2_getxattr(struct dentry *dentry, const char *name,
@@ -1140,8 +1103,6 @@ static ssize_t gfs2_getxattr(struct dentry *dentry, const char *name,
 {
        struct gfs2_ea_request er;
 
-       atomic_inc(&get_v2sdp(dentry->d_inode->i_sb)->sd_ops_inode);
-
        memset(&er, 0, sizeof(struct gfs2_ea_request));
        er.er_type = gfs2_ea_name2type(name, &er.er_name);
        if (er.er_type == GFS2_EATYPE_UNUSED)
@@ -1150,38 +1111,34 @@ static ssize_t gfs2_getxattr(struct dentry *dentry, const char *name,
        er.er_name_len = strlen(er.er_name);
        er.er_data_len = size;
 
-       return gfs2_ea_get(get_v2ip(dentry->d_inode), &er);
+       return gfs2_ea_get(GFS2_I(dentry->d_inode), &er);
 }
 
 static ssize_t gfs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
 {
        struct gfs2_ea_request er;
 
-       atomic_inc(&get_v2sdp(dentry->d_inode->i_sb)->sd_ops_inode);
-
        memset(&er, 0, sizeof(struct gfs2_ea_request));
        er.er_data = (size) ? buffer : NULL;
        er.er_data_len = size;
 
-       return gfs2_ea_list(get_v2ip(dentry->d_inode), &er);
+       return gfs2_ea_list(GFS2_I(dentry->d_inode), &er);
 }
 
 static int gfs2_removexattr(struct dentry *dentry, const char *name)
 {
        struct gfs2_ea_request er;
 
-       atomic_inc(&get_v2sdp(dentry->d_inode->i_sb)->sd_ops_inode);
-
        memset(&er, 0, sizeof(struct gfs2_ea_request));
        er.er_type = gfs2_ea_name2type(name, &er.er_name);
        if (er.er_type == GFS2_EATYPE_UNUSED)
                return -EOPNOTSUPP;
        er.er_name_len = strlen(er.er_name);
 
-       return gfs2_ea_remove(get_v2ip(dentry->d_inode), &er);
+       return gfs2_ea_remove(GFS2_I(dentry->d_inode), &er);
 }
 
-struct inode_operations gfs2_file_iops = {
+const struct inode_operations gfs2_file_iops = {
        .permission = gfs2_permission,
        .setattr = gfs2_setattr,
        .getattr = gfs2_getattr,
@@ -1191,7 +1148,7 @@ struct inode_operations gfs2_file_iops = {
        .removexattr = gfs2_removexattr,
 };
 
-struct inode_operations gfs2_dev_iops = {
+const struct inode_operations gfs2_dev_iops = {
        .permission = gfs2_permission,
        .setattr = gfs2_setattr,
        .getattr = gfs2_getattr,
@@ -1201,7 +1158,7 @@ struct inode_operations gfs2_dev_iops = {
        .removexattr = gfs2_removexattr,
 };
 
-struct inode_operations gfs2_dir_iops = {
+const struct inode_operations gfs2_dir_iops = {
        .create = gfs2_create,
        .lookup = gfs2_lookup,
        .link = gfs2_link,
@@ -1220,7 +1177,7 @@ struct inode_operations gfs2_dir_iops = {
        .removexattr = gfs2_removexattr,
 };
 
-struct inode_operations gfs2_symlink_iops = {
+const struct inode_operations gfs2_symlink_iops = {
        .readlink = gfs2_readlink,
        .follow_link = gfs2_follow_link,
        .permission = gfs2_permission,