Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index ac9535be304f070405ec89bb138590801979640e..d470e5286ecd7715e0804a7fc54a6e34015c7559 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -17,6 +17,7 @@
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
 #include <linux/lm_interface.h>
+#include <linux/security.h>
 
 #include "gfs2.h"
 #include "incore.h"
@@ -72,7 +73,6 @@ void gfs2_inode_attr_in(struct gfs2_inode *ip)
        inode->i_atime.tv_nsec = 0;
        inode->i_mtime.tv_nsec = 0;
        inode->i_ctime.tv_nsec = 0;
-       inode->i_blksize = PAGE_SIZE;
        inode->i_blocks = di->di_blocks <<
                (GFS2_SB(inode)->sd_sb.sb_bsize_shift - GFS2_BASIC_BLOCK_SHIFT);
 
@@ -157,10 +157,13 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum *inum,
        struct gfs2_glock *io_gl;
        int error;
 
+       if (!inode)
+               return ERR_PTR(-ENOBUFS);
+
        if (inode->i_state & I_NEW) {
                struct gfs2_sbd *sdp = GFS2_SB(inode);
                umode_t mode = DT2IF(type);
-               inode->u.generic_ip = ip;
+               inode->i_private = ip;
                inode->i_mode = mode;
 
                if (S_ISREG(mode)) {
@@ -354,6 +357,7 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff)
                if (error)
                        goto out_norgrp;
 
+               clear_nlink(&ip->i_inode);
                gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
                gfs2_glock_dq_uninit(&rg_gh);
 out_norgrp:
@@ -806,6 +810,39 @@ fail:
        return error;
 }
 
+static int gfs2_security_init(struct gfs2_inode *dip, struct gfs2_inode *ip)
+{
+       int err;
+       size_t len;
+       void *value;
+       char *name;
+       struct gfs2_ea_request er;
+
+       err = security_inode_init_security(&ip->i_inode, &dip->i_inode,
+                                          &name, &value, &len);
+
+       if (err) {
+               if (err == -EOPNOTSUPP)
+                       return 0;
+               return err;
+       }
+
+       memset(&er, 0, sizeof(struct gfs2_ea_request));
+
+       er.er_type = GFS2_EATYPE_SECURITY;
+       er.er_name = name;
+       er.er_data = value;
+       er.er_name_len = strlen(name);
+       er.er_data_len = len;
+
+       err = gfs2_ea_set_i(ip, &er);
+
+       kfree(value);
+       kfree(name);
+
+       return err;
+}
+
 /**
  * gfs2_createi - Create a new inode
  * @ghs: An array of two holders
@@ -897,6 +934,10 @@ struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,
        if (error)
                goto fail_iput;
 
+       error = gfs2_security_init(dip, GFS2_I(inode));
+       if (error)
+               goto fail_iput;
+
        error = link_dinode(dip, name, GFS2_I(inode));
        if (error)
                goto fail_iput;
@@ -1167,6 +1208,7 @@ int gfs2_glock_nq_atime(struct gfs2_holder *gh)
                curtime = get_seconds();
                if (curtime - ip->i_di.di_atime >= quantum) {
                        struct buffer_head *dibh;
+                       struct gfs2_dinode *di;
 
                        error = gfs2_trans_begin(sdp, RES_DINODE, 0);
                        if (error == -EROFS)
@@ -1181,7 +1223,8 @@ int gfs2_glock_nq_atime(struct gfs2_holder *gh)
                        ip->i_di.di_atime = curtime;
 
                        gfs2_trans_add_bh(ip->i_gl, dibh, 1);
-                       gfs2_dinode_out(&ip->i_di, dibh->b_data);
+                       di = (struct gfs2_dinode *)dibh->b_data;
+                       di->di_atime = cpu_to_be64(ip->i_di.di_atime);
                        brelse(dibh);
 
                        gfs2_trans_end(sdp);