Merge tag 'xfs-for-linus-v3.12-rc4' of git://oss.sgi.com/xfs/xfs

Pull xfs bugfixes from Ben Myers: "There are lockdep annotations for project quotas, a fix for dirent dtype support on v4 filesystems, a fix for a memory leak in recovery, and a fix for the build error that resulted from it. D'oh" * tag 'xfs-for-linus-v3.12-rc4' of git://oss.sgi.com/xfs/xfs: xfs: Use kmem_free() instead of free() xfs: fix memory leak in xlog_recover_add_to_trans xfs: dirent dtype presence is dependent on directory magic numbers xfs: lockdep needs to know about 3 dquot-deep nesting

Merge tag 'xfs-for-linus-v3.12-rc4' of git://oss.sgi.com/xfs/xfs
Pull xfs bugfixes from Ben Myers: "There are lockdep annotations for project quotas, a fix for dirent dtype support on v4 filesystems, a fix for a memory leak in recovery, and a fix for the build error that resulted from it. D'oh" * tag 'xfs-for-linus-v3.12-rc4' of git://oss.sgi.com/xfs/xfs: xfs: Use kmem_free() instead of free() xfs: fix memory leak in xlog_recover_add_to_trans xfs: dirent dtype presence is dependent on directory magic numbers xfs: lockdep needs to know about 3 dquot-deep nesting
Linus Torvalds
2 parents ab35406264 b2a42f78ab
Showing 6 changed files Side-by-side Diff
fs/xfs/xfs_dir2_block.c
fs/xfs/xfs_dir2_format.h
fs/xfs/xfs_dir2_readdir.c
fs/xfs/xfs_dir2_sf.c
fs/xfs/xfs_dquot.c
fs/xfs/xfs_log_recover.c
@@ -1158,7 +1158,7 @@
 	/*
 	 * Create entry for .
 	 */
-	dep = xfs_dir3_data_dot_entry_p(hdr);
+	dep = xfs_dir3_data_dot_entry_p(mp, hdr);
 	dep->inumber = cpu_to_be64(dp->i_ino);
 	dep->namelen = 1;
 	dep->name[0] = '.';
@@ -1172,7 +1172,7 @@
 	/*
 	 * Create entry for ..
 	 */
-	dep = xfs_dir3_data_dotdot_entry_p(hdr);
+	dep = xfs_dir3_data_dotdot_entry_p(mp, hdr);
 	dep->inumber = cpu_to_be64(xfs_dir2_sf_get_parent_ino(sfp));
 	dep->namelen = 2;
 	dep->name[0] = dep->name[1] = '.';
@@ -1183,7 +1183,7 @@
 	blp[1].hashval = cpu_to_be32(xfs_dir_hash_dotdot);
 	blp[1].address = cpu_to_be32(xfs_dir2_byte_to_dataptr(mp,
 				(char *)dep - (char *)hdr));
-	offset = xfs_dir3_data_first_offset(hdr);
+	offset = xfs_dir3_data_first_offset(mp);
 	/*
 	 * Loop over existing entries, stuff them in.
 	 */
@@ -497,69 +497,58 @@
 /*
  * Offsets of . and .. in data space (always block 0)
  *
- * The macros are used for shortform directories as they have no headers to read
- * the magic number out of. Shortform directories need to know the size of the
- * data block header because the sfe embeds the block offset of the entry into
- * it so that it doesn't change when format conversion occurs. Bad Things Happen
- * if we don't follow this rule.
- *
  * XXX: there is scope for significant optimisation of the logic here. Right
  * now we are checking for "dir3 format" over and over again. Ideally we should
  * only do it once for each operation.
  */
-#define	XFS_DIR3_DATA_DOT_OFFSET(mp)	\
-	xfs_dir3_data_hdr_size(xfs_sb_version_hascrc(&(mp)->m_sb))
-#define	XFS_DIR3_DATA_DOTDOT_OFFSET(mp)	\
-	(XFS_DIR3_DATA_DOT_OFFSET(mp) + xfs_dir3_data_entsize(mp, 1))
-#define	XFS_DIR3_DATA_FIRST_OFFSET(mp)		\
-	(XFS_DIR3_DATA_DOTDOT_OFFSET(mp) + xfs_dir3_data_entsize(mp, 2))
-
 static inline xfs_dir2_data_aoff_t
-xfs_dir3_data_dot_offset(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_dot_offset(struct xfs_mount *mp)
 {
-	return xfs_dir3_data_entry_offset(hdr);
+	return xfs_dir3_data_hdr_size(xfs_sb_version_hascrc(&mp->m_sb));
 }
  
 static inline xfs_dir2_data_aoff_t
-xfs_dir3_data_dotdot_offset(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_dotdot_offset(struct xfs_mount *mp)
 {
-	bool dir3 = hdr->magic == cpu_to_be32(XFS_DIR3_DATA_MAGIC) ||
-		    hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC);
-	return xfs_dir3_data_dot_offset(hdr) +
-		__xfs_dir3_data_entsize(dir3, 1);
+	return xfs_dir3_data_dot_offset(mp) +
+		xfs_dir3_data_entsize(mp, 1);
 }
  
 static inline xfs_dir2_data_aoff_t
-xfs_dir3_data_first_offset(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_first_offset(struct xfs_mount *mp)
 {
-	bool dir3 = hdr->magic == cpu_to_be32(XFS_DIR3_DATA_MAGIC) ||
-		    hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC);
-	return xfs_dir3_data_dotdot_offset(hdr) +
-		__xfs_dir3_data_entsize(dir3, 2);
+	return xfs_dir3_data_dotdot_offset(mp) +
+		xfs_dir3_data_entsize(mp, 2);
 }
  
 /*
  * location of . and .. in data space (always block 0)
  */
 static inline struct xfs_dir2_data_entry *
-xfs_dir3_data_dot_entry_p(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_dot_entry_p(
+	struct xfs_mount	*mp,
+	struct xfs_dir2_data_hdr *hdr)
 {
 	return (struct xfs_dir2_data_entry *)
-		((char *)hdr + xfs_dir3_data_dot_offset(hdr));
+		((char *)hdr + xfs_dir3_data_dot_offset(mp));
 }
  
 static inline struct xfs_dir2_data_entry *
-xfs_dir3_data_dotdot_entry_p(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_dotdot_entry_p(
+	struct xfs_mount	*mp,
+	struct xfs_dir2_data_hdr *hdr)
 {
 	return (struct xfs_dir2_data_entry *)
-		((char *)hdr + xfs_dir3_data_dotdot_offset(hdr));
+		((char *)hdr + xfs_dir3_data_dotdot_offset(mp));
 }
  
 static inline struct xfs_dir2_data_entry *
-xfs_dir3_data_first_entry_p(struct xfs_dir2_data_hdr *hdr)
+xfs_dir3_data_first_entry_p(
+	struct xfs_mount	*mp,
+	struct xfs_dir2_data_hdr *hdr)
 {
 	return (struct xfs_dir2_data_entry *)
-		((char *)hdr + xfs_dir3_data_first_offset(hdr));
+		((char *)hdr + xfs_dir3_data_first_offset(mp));
 }
  
 /*
@@ -119,9 +119,9 @@
 	 * mp->m_dirdatablk.
 	 */
 	dot_offset = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,
-					     XFS_DIR3_DATA_DOT_OFFSET(mp));
+					     xfs_dir3_data_dot_offset(mp));
 	dotdot_offset = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,
-						XFS_DIR3_DATA_DOTDOT_OFFSET(mp));
+						xfs_dir3_data_dotdot_offset(mp));
  
 	/*
 	 * Put . entry unless we're starting past it.
@@ -557,7 +557,7 @@
 	 * to insert the new entry.
 	 * If it's going to end up at the end then oldsfep will point there.
 	 */
-	for (offset = XFS_DIR3_DATA_FIRST_OFFSET(mp),
+	for (offset = xfs_dir3_data_first_offset(mp),
 	      oldsfep = xfs_dir2_sf_firstentry(oldsfp),
 	      add_datasize = xfs_dir3_data_entsize(mp, args->namelen),
 	      eof = (char *)oldsfep == &buf[old_isize];
@@ -640,7 +640,7 @@
  
 	sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
 	size = xfs_dir3_data_entsize(mp, args->namelen);
-	offset = XFS_DIR3_DATA_FIRST_OFFSET(mp);
+	offset = xfs_dir3_data_first_offset(mp);
 	sfep = xfs_dir2_sf_firstentry(sfp);
 	holefit = 0;
 	/*
@@ -713,7 +713,7 @@
 	mp = dp->i_mount;
  
 	sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
-	offset = XFS_DIR3_DATA_FIRST_OFFSET(mp);
+	offset = xfs_dir3_data_first_offset(mp);
 	ino = xfs_dir2_sf_get_parent_ino(sfp);
 	i8count = ino > XFS_DIR2_MAX_SHORT_INUM;
  
@@ -64,7 +64,8 @@
 struct kmem_zone		*xfs_qm_dqtrxzone;
 static struct kmem_zone		*xfs_qm_dqzone;
  
-static struct lock_class_key xfs_dquot_other_class;
+static struct lock_class_key xfs_dquot_group_class;
+static struct lock_class_key xfs_dquot_project_class;
  
 /*
  * This is called to free all the memory associated with a dquot
@@ -703,8 +704,20 @@
 	 * Make sure group quotas have a different lock class than user
 	 * quotas.
 	 */
-	if (!(type & XFS_DQ_USER))
-		lockdep_set_class(&dqp->q_qlock, &xfs_dquot_other_class);
+	switch (type) {
+	case XFS_DQ_USER:
+		/* uses the default lock class */
+		break;
+	case XFS_DQ_GROUP:
+		lockdep_set_class(&dqp->q_qlock, &xfs_dquot_group_class);
+		break;
+	case XFS_DQ_PROJ:
+		lockdep_set_class(&dqp->q_qlock, &xfs_dquot_project_class);
+		break;
+	default:
+		ASSERT(0);
+		break;
+	}
  
 	XFS_STATS_INC(xs_qm_dquot);
  
@@ -1585,6 +1585,7 @@
 		"bad number of regions (%d) in inode log format",
 				  in_f->ilf_size);
 			ASSERT(0);
+			kmem_free(ptr);
 			return XFS_ERROR(EIO);
 		}
...	...	@@ -1158,7 +1158,7 @@
1158	1158	/*
1159	1159	* Create entry for .
1160	1160	*/
1161		- dep = xfs_dir3_data_dot_entry_p(hdr);
	1161	+ dep = xfs_dir3_data_dot_entry_p(mp, hdr);
1162	1162	dep->inumber = cpu_to_be64(dp->i_ino);
1163	1163	dep->namelen = 1;
1164	1164	dep->name[0] = '.';
...	...	@@ -1172,7 +1172,7 @@
1172	1172	/*
1173	1173	* Create entry for ..
1174	1174	*/
1175		- dep = xfs_dir3_data_dotdot_entry_p(hdr);
	1175	+ dep = xfs_dir3_data_dotdot_entry_p(mp, hdr);
1176	1176	dep->inumber = cpu_to_be64(xfs_dir2_sf_get_parent_ino(sfp));
1177	1177	dep->namelen = 2;
1178	1178	dep->name[0] = dep->name[1] = '.';
...	...	@@ -1183,7 +1183,7 @@
1183	1183	blp[1].hashval = cpu_to_be32(xfs_dir_hash_dotdot);
1184	1184	blp[1].address = cpu_to_be32(xfs_dir2_byte_to_dataptr(mp,
1185	1185	(char )dep - (char )hdr));
1186		- offset = xfs_dir3_data_first_offset(hdr);
	1186	+ offset = xfs_dir3_data_first_offset(mp);
1187	1187	/*
1188	1188	* Loop over existing entries, stuff them in.
1189	1189	*/
...	...	@@ -497,69 +497,58 @@
497	497	/*
498	498	* Offsets of . and .. in data space (always block 0)
499	499	*
500		- * The macros are used for shortform directories as they have no headers to read
501		- * the magic number out of. Shortform directories need to know the size of the
502		- * data block header because the sfe embeds the block offset of the entry into
503		- * it so that it doesn't change when format conversion occurs. Bad Things Happen
504		- * if we don't follow this rule.
505		- *
506	500	* XXX: there is scope for significant optimisation of the logic here. Right
507	501	* now we are checking for "dir3 format" over and over again. Ideally we should
508	502	* only do it once for each operation.
509	503	*/
510		-#define XFS_DIR3_DATA_DOT_OFFSET(mp) \
511		- xfs_dir3_data_hdr_size(xfs_sb_version_hascrc(&(mp)->m_sb))
512		-#define XFS_DIR3_DATA_DOTDOT_OFFSET(mp) \
513		- (XFS_DIR3_DATA_DOT_OFFSET(mp) + xfs_dir3_data_entsize(mp, 1))
514		-#define XFS_DIR3_DATA_FIRST_OFFSET(mp) \
515		- (XFS_DIR3_DATA_DOTDOT_OFFSET(mp) + xfs_dir3_data_entsize(mp, 2))
516		-
517	504	static inline xfs_dir2_data_aoff_t
518		-xfs_dir3_data_dot_offset(struct xfs_dir2_data_hdr *hdr)
	505	+xfs_dir3_data_dot_offset(struct xfs_mount *mp)
519	506	{
520		- return xfs_dir3_data_entry_offset(hdr);
	507	+ return xfs_dir3_data_hdr_size(xfs_sb_version_hascrc(&mp->m_sb));
521	508	}
522	509
523	510	static inline xfs_dir2_data_aoff_t
524		-xfs_dir3_data_dotdot_offset(struct xfs_dir2_data_hdr *hdr)
	511	+xfs_dir3_data_dotdot_offset(struct xfs_mount *mp)
525	512	{
526		- bool dir3 = hdr->magic == cpu_to_be32(XFS_DIR3_DATA_MAGIC) \|\|
527		- hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC);
528		- return xfs_dir3_data_dot_offset(hdr) +
529		- __xfs_dir3_data_entsize(dir3, 1);
	513	+ return xfs_dir3_data_dot_offset(mp) +
	514	+ xfs_dir3_data_entsize(mp, 1);
530	515	}
531	516
532	517	static inline xfs_dir2_data_aoff_t
533		-xfs_dir3_data_first_offset(struct xfs_dir2_data_hdr *hdr)
	518	+xfs_dir3_data_first_offset(struct xfs_mount *mp)
534	519	{
535		- bool dir3 = hdr->magic == cpu_to_be32(XFS_DIR3_DATA_MAGIC) \|\|
536		- hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC);
537		- return xfs_dir3_data_dotdot_offset(hdr) +
538		- __xfs_dir3_data_entsize(dir3, 2);
	520	+ return xfs_dir3_data_dotdot_offset(mp) +
	521	+ xfs_dir3_data_entsize(mp, 2);
539	522	}
540	523
541	524	/*
542	525	* location of . and .. in data space (always block 0)
543	526	*/
544	527	static inline struct xfs_dir2_data_entry *
545		-xfs_dir3_data_dot_entry_p(struct xfs_dir2_data_hdr *hdr)
	528	+xfs_dir3_data_dot_entry_p(
	529	+ struct xfs_mount *mp,
	530	+ struct xfs_dir2_data_hdr *hdr)
546	531	{
547	532	return (struct xfs_dir2_data_entry *)
548		- ((char *)hdr + xfs_dir3_data_dot_offset(hdr));
	533	+ ((char *)hdr + xfs_dir3_data_dot_offset(mp));
549	534	}
550	535
551	536	static inline struct xfs_dir2_data_entry *
552		-xfs_dir3_data_dotdot_entry_p(struct xfs_dir2_data_hdr *hdr)
	537	+xfs_dir3_data_dotdot_entry_p(
	538	+ struct xfs_mount *mp,
	539	+ struct xfs_dir2_data_hdr *hdr)
553	540	{
554	541	return (struct xfs_dir2_data_entry *)
555		- ((char *)hdr + xfs_dir3_data_dotdot_offset(hdr));
	542	+ ((char *)hdr + xfs_dir3_data_dotdot_offset(mp));
556	543	}
557	544
558	545	static inline struct xfs_dir2_data_entry *
559		-xfs_dir3_data_first_entry_p(struct xfs_dir2_data_hdr *hdr)
	546	+xfs_dir3_data_first_entry_p(
	547	+ struct xfs_mount *mp,
	548	+ struct xfs_dir2_data_hdr *hdr)
560	549	{
561	550	return (struct xfs_dir2_data_entry *)
562		- ((char *)hdr + xfs_dir3_data_first_offset(hdr));
	551	+ ((char *)hdr + xfs_dir3_data_first_offset(mp));
563	552	}
564	553
565	554	/*
...	...	@@ -119,9 +119,9 @@
119	119	* mp->m_dirdatablk.
120	120	*/
121	121	dot_offset = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,
122		- XFS_DIR3_DATA_DOT_OFFSET(mp));
	122	+ xfs_dir3_data_dot_offset(mp));
123	123	dotdot_offset = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,
124		- XFS_DIR3_DATA_DOTDOT_OFFSET(mp));
	124	+ xfs_dir3_data_dotdot_offset(mp));
125	125
126	126	/*
127	127	* Put . entry unless we're starting past it.
...	...	@@ -557,7 +557,7 @@
557	557	* to insert the new entry.
558	558	* If it's going to end up at the end then oldsfep will point there.
559	559	*/
560		- for (offset = XFS_DIR3_DATA_FIRST_OFFSET(mp),
	560	+ for (offset = xfs_dir3_data_first_offset(mp),
561	561	oldsfep = xfs_dir2_sf_firstentry(oldsfp),
562	562	add_datasize = xfs_dir3_data_entsize(mp, args->namelen),
563	563	eof = (char *)oldsfep == &buf[old_isize];
...	...	@@ -640,7 +640,7 @@
640	640
641	641	sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
642	642	size = xfs_dir3_data_entsize(mp, args->namelen);
643		- offset = XFS_DIR3_DATA_FIRST_OFFSET(mp);
	643	+ offset = xfs_dir3_data_first_offset(mp);
644	644	sfep = xfs_dir2_sf_firstentry(sfp);
645	645	holefit = 0;
646	646	/*
...	...	@@ -713,7 +713,7 @@
713	713	mp = dp->i_mount;
714	714
715	715	sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
716		- offset = XFS_DIR3_DATA_FIRST_OFFSET(mp);
	716	+ offset = xfs_dir3_data_first_offset(mp);
717	717	ino = xfs_dir2_sf_get_parent_ino(sfp);
718	718	i8count = ino > XFS_DIR2_MAX_SHORT_INUM;
719	719
...	...	@@ -64,7 +64,8 @@
64	64	struct kmem_zone *xfs_qm_dqtrxzone;
65	65	static struct kmem_zone *xfs_qm_dqzone;
66	66
67		-static struct lock_class_key xfs_dquot_other_class;
	67	+static struct lock_class_key xfs_dquot_group_class;
	68	+static struct lock_class_key xfs_dquot_project_class;
68	69
69	70	/*
70	71	* This is called to free all the memory associated with a dquot
...	...	@@ -703,8 +704,20 @@
703	704	* Make sure group quotas have a different lock class than user
704	705	* quotas.
705	706	*/
706		- if (!(type & XFS_DQ_USER))
707		- lockdep_set_class(&dqp->q_qlock, &xfs_dquot_other_class);
	707	+ switch (type) {
	708	+ case XFS_DQ_USER:
	709	+ /* uses the default lock class */
	710	+ break;
	711	+ case XFS_DQ_GROUP:
	712	+ lockdep_set_class(&dqp->q_qlock, &xfs_dquot_group_class);
	713	+ break;
	714	+ case XFS_DQ_PROJ:
	715	+ lockdep_set_class(&dqp->q_qlock, &xfs_dquot_project_class);
	716	+ break;
	717	+ default:
	718	+ ASSERT(0);
	719	+ break;
	720	+ }
708	721
709	722	XFS_STATS_INC(xs_qm_dquot);
710	723
...	...	@@ -1585,6 +1585,7 @@
1585	1585	"bad number of regions (%d) in inode log format",
1586	1586	in_f->ilf_size);
1587	1587	ASSERT(0);
	1588	+ kmem_free(ptr);
1588	1589	return XFS_ERROR(EIO);
1589	1590	}
1590	1591