Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bc77ecb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Add JBD2 compat feature bit.
  ocfs2: Always update xattr search when creating bucket.
parents 3797455f a9772189

fs/ocfs2/ocfs2_fs.h

+7 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,8 @@ 
#define OCFS2_CLEAR_INCOMPAT_FEATURE(sb,mask)			\

#define OCFS2_CLEAR_INCOMPAT_FEATURE(sb,mask)			\

	OCFS2_SB(sb)->s_feature_incompat &= ~(mask)

	OCFS2_SB(sb)->s_feature_incompat &= ~(mask)





#define OCFS2_FEATURE_COMPAT_SUPP	OCFS2_FEATURE_COMPAT_BACKUP_SB

#define OCFS2_FEATURE_COMPAT_SUPP	(OCFS2_FEATURE_COMPAT_BACKUP_SB	\

					 | OCFS2_FEATURE_COMPAT_JBD2_SB)

#define OCFS2_FEATURE_INCOMPAT_SUPP	(OCFS2_FEATURE_INCOMPAT_LOCAL_MOUNT \

#define OCFS2_FEATURE_INCOMPAT_SUPP	(OCFS2_FEATURE_INCOMPAT_LOCAL_MOUNT \

					 | OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC \

					 | OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC \

					 | OCFS2_FEATURE_INCOMPAT_INLINE_DATA \

					 | OCFS2_FEATURE_INCOMPAT_INLINE_DATA \
@@ -152,6 +153,11 @@ 
 */

 */

#define OCFS2_FEATURE_COMPAT_BACKUP_SB		0x0001

#define OCFS2_FEATURE_COMPAT_BACKUP_SB		0x0001





/*

 * The filesystem will correctly handle journal feature bits.

 */

#define OCFS2_FEATURE_COMPAT_JBD2_SB		0x0002



/*

/*

 * Unwritten extents support.

 * Unwritten extents support.

 */

 */

fs/ocfs2/xattr.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2645,10 +2645,10 @@ static int ocfs2_xattr_update_xattr_search(struct inode *inode, 
				return ret;

				return ret;

			}

			}





		}

		i = xs->here - old_xh->xh_entries;

		i = xs->here - old_xh->xh_entries;

		xs->here = &xs->header->xh_entries[i];

		xs->here = &xs->header->xh_entries[i];

	}

	}

	}





	return ret;

	return ret;

}

}