GFS2: Allocate block for xattr at inode alloc time, if required

This is another step towards improving the allocation of xattr blocks at inode allocation time. Here we take advantage of Christoph's recent work on ACLs to allocate a block for the xattrs early if we know that we will be adding ACLs to the inode later on. The advantage of that is that it is much more likely that we'll get a contiguous run of two blocks where the first is the inode and the second is the xattr block. We still have to fall back to the original system in case we don't get the requested two contiguous blocks, or in case the ACLs are too large to fit into the block. Future patches will move more of the ACL setting code further up the gfs2_inode_create() function. Also, I'd like to be able to do the same thing with the xattrs from LSMs in due course, too. That way we should be able to slowly reduce the number of independent transactions, at least in the most common cases.

Steven Whitehouse committed 12 years ago

Commit b2c8b3e1 parent 885bcec3 files · +46 −10Browse files

Unified · Split

3 files

fs/gfs2/inode.c +43 −7
fs/gfs2/rgrp.c +1 −1
include/uapi/linux/gfs2_ondisk.h +2 −2

fs/gfs2/inode.c+43−7

 		inode->i_gid = current_fsgid();
 }
-static int alloc_dinode(struct gfs2_inode *ip, u32 flags)
+static int alloc_dinode(struct gfs2_inode *ip, u32 flags, unsigned *dblocks)
 {
 	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
-	struct gfs2_alloc_parms ap = { .target = RES_DINODE, .aflags = flags, };
+	struct gfs2_alloc_parms ap = { .target = *dblocks, .aflags = flags, };
 	int error;
-	int dblocks = 1;
 	error = gfs2_quota_lock_check(ip);
 	if (error)
 	if (error)
 		goto out_quota;
-	error = gfs2_trans_begin(sdp, RES_RG_BIT + RES_STATFS + RES_QUOTA, 0);
+	error = gfs2_trans_begin(sdp, (*dblocks * RES_RG_BIT) + RES_STATFS + RES_QUOTA, 0);
 	if (error)
 		goto out_ipreserv;
-	error = gfs2_alloc_blocks(ip, &ip->i_no_addr, &dblocks, 1, &ip->i_generation);
+	error = gfs2_alloc_blocks(ip, &ip->i_no_addr, dblocks, 1, &ip->i_generation);
 	ip->i_no_formal_ino = ip->i_generation;
 	ip->i_inode.i_ino = ip->i_no_addr;
 	ip->i_goal = ip->i_no_addr;
 }
+/**
+ * gfs2_init_xattr - Initialise an xattr block for a new inode
+ * @ip: The inode in question
+ *
+ * This sets up an empty xattr block for a new inode, ready to
+ * take any ACLs, LSM xattrs, etc.
+ */
+static void gfs2_init_xattr(struct gfs2_inode *ip)
+{
+	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
+	struct buffer_head *bh;
+	struct gfs2_ea_header *ea;
+	bh = gfs2_meta_new(ip->i_gl, ip->i_eattr);
+	gfs2_trans_add_meta(ip->i_gl, bh);
+	gfs2_metatype_set(bh, GFS2_METATYPE_EA, GFS2_FORMAT_EA);
+	gfs2_buffer_clear_tail(bh, sizeof(struct gfs2_meta_header));
+	ea = GFS2_EA_BH2FIRST(bh);
+	ea->ea_rec_len = cpu_to_be32(sdp->sd_jbsize);
+	ea->ea_type = GFS2_EATYPE_UNUSED;
+	ea->ea_flags = GFS2_EAFLAG_LAST;
+	brelse(bh);
+}
 /**
  * init_dinode - Fill in a new dinode structure
  * @dip: The directory this inode is being created in
 	struct dentry *d;
 	int error;
 	u32 aflags = 0;
+	unsigned blocks = 1;
 	struct gfs2_diradd da = { .bh = NULL, };
 	if (!name->len || name->len > GFS2_FNAMESIZE)
 	    (dip->i_diskflags & GFS2_DIF_TOPDIR))
 		aflags |= GFS2_AF_ORLOV;
-	error = alloc_dinode(ip, aflags);
+	if (default_acl || acl)
+		blocks++;
+	error = alloc_dinode(ip, aflags, &blocks);
 	if (error)
 		goto fail_free_inode;
+	gfs2_set_inode_blocks(inode, blocks);
 	error = gfs2_glock_get(sdp, ip->i_no_addr, &gfs2_inode_glops, CREATE, &ip->i_gl);
 	if (error)
 		goto fail_free_inode;
 	if (error)
 		goto fail_free_inode;
-	error = gfs2_trans_begin(sdp, RES_DINODE, 0);
+	error = gfs2_trans_begin(sdp, blocks, 0);
 	if (error)
 		goto fail_gunlock2;
+	if (blocks > 1) {
+		ip->i_eattr = ip->i_no_addr + 1;
+		gfs2_init_xattr(ip);
+	}
 	init_dinode(dip, ip, symname);
 	gfs2_trans_end(sdp);

fs/gfs2/rgrp.c+1−1

@@ -2296,7 +2296,7 @@ int gfs2_alloc_blocks(struct gfs2_inode ip, u64 bn, unsigned int *nblocks, · 2295 unmodified lines
2296		2296
2297	gfs2_statfs_change(sdp, 0, -(s64)*nblocks, dinode ? 1 : 0);	2297	gfs2_statfs_change(sdp, 0, -(s64)*nblocks, dinode ? 1 : 0);
2298	if (dinode)	2298	if (dinode)
2299	gfs2_trans_add_unrevoke(sdp, block, 1);	2299	gfs2_trans_add_unrevoke(sdp, block, *nblocks);
2300		2300
2301	gfs2_quota_change(ip, *nblocks, ip->i_inode.i_uid, ip->i_inode.i_gid);	2301	gfs2_quota_change(ip, *nblocks, ip->i_inode.i_uid, ip->i_inode.i_gid);
2302		2302

include/uapi/linux/gfs2_ondisk.h+2−2

@@ -347,9 +347,9 @@ struct gfs2_leaf { · 346 unmodified lines
347	* metadata header. Each inode, if it has extended attributes, will	347	* metadata header. Each inode, if it has extended attributes, will
348	* have either a single block containing the extended attribute headers	348	* have either a single block containing the extended attribute headers
349	* or a single indirect block pointing to blocks containing the	349	* or a single indirect block pointing to blocks containing the
350	* extended attribure headers.	350	* extended attribute headers.
351	*	351	*
352	* The maximim size of the data part of an extended attribute is 64k	352	* The maximum size of the data part of an extended attribute is 64k
353	* so the number of blocks required depends upon block size. Since the	353	* so the number of blocks required depends upon block size. Since the
354	* block size also determines the number of pointers in an indirect	354	* block size also determines the number of pointers in an indirect
355	* block, its a fairly complicated calculation to work out the maximum	355	* block, its a fairly complicated calculation to work out the maximum

GFS2: Allocate block for xattr at inode alloc time, if required

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code