Commit 45e62974 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2/trivial: Use le16_to_cpu for a disk value in xattr.c
  ocfs2/trivial: Use proper mask for 2 places in hearbeat.c
  Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink.
  Ocfs2: Should ocfs2 support fiemap for S_IFDIR inode?
  ocfs2: Use FIEMAP_EXTENT_SHARED
  fiemap: Add new extent flag FIEMAP_EXTENT_SHARED
  ocfs2: replace u8 by __u8 in ocfs2_fs.h
  ocfs2: explicit declare uninitialized var in user_cluster_connect()
  ocfs2-devel: remove redundant OCFS2_MOUNT_POSIX_ACL check in ocfs2_get_acl_nolock()
  ocfs2: return -EAGAIN instead of EAGAIN in dlm
  ocfs2/cluster: Make fence method configurable - v2
  ocfs2: Set MS_POSIXACL on remount
  ocfs2: Make acl use the default
  ocfs2: Always include ACL support
parents 756fe285 8ff6af88

fs/ocfs2/Kconfig

+1 −9
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config OCFS2_FS 
	select CRC32

	select QUOTA

	select QUOTA_TREE

	select FS_POSIX_ACL

	help

	  OCFS2 is a general purpose extent based shared disk cluster file

	  system with many similarities to ext3. It supports 64 bit inode
@@ -74,12 +75,3 @@ config OCFS2_DEBUG_FS 
	  This option will enable expensive consistency checks. Enable

	  this option for debugging only as it is likely to decrease

	  performance of the filesystem.
 


config OCFS2_FS_POSIX_ACL

	bool "OCFS2 POSIX Access Control Lists"

	depends on OCFS2_FS

	select FS_POSIX_ACL

	default n

	help

	  Posix Access Control Lists (ACLs) support permissions for users and

	  groups beyond the owner/group/world scheme.

fs/ocfs2/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -39,11 +39,8 @@ ocfs2-objs := \ 
	ver.o			\

	quota_local.o		\

	quota_global.o		\

	xattr.o



ifeq ($(CONFIG_OCFS2_FS_POSIX_ACL),y)

ocfs2-objs += acl.o

endif

	xattr.o			\

	acl.o



ocfs2_stackglue-objs := stackglue.o

ocfs2_stack_o2cb-objs := stack_o2cb.o

fs/ocfs2/acl.c

+0 −4
Original line number Diff line number Diff line
@@ -98,15 +98,11 @@ static struct posix_acl *ocfs2_get_acl_nolock(struct inode *inode, 
					      int type,

					      struct buffer_head *di_bh)

{

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	int name_index;

	char *value = NULL;

	struct posix_acl *acl;

	int retval;



	if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))

		return NULL;



	switch (type) {

	case ACL_TYPE_ACCESS:

		name_index = OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS;

fs/ocfs2/acl.h

+0 −22
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ struct ocfs2_acl_entry { 
	__le32 e_id;

};



#ifdef CONFIG_OCFS2_FS_POSIX_ACL



extern int ocfs2_check_acl(struct inode *, int);

extern int ocfs2_acl_chmod(struct inode *);

extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *,
@@ -35,24 +33,4 @@ extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *, 
			  struct ocfs2_alloc_context *,

			  struct ocfs2_alloc_context *);



#else /* CONFIG_OCFS2_FS_POSIX_ACL*/



#define ocfs2_check_acl NULL

static inline int ocfs2_acl_chmod(struct inode *inode)

{

	return 0;

}

static inline int ocfs2_init_acl(handle_t *handle,

				 struct inode *inode,

				 struct inode *dir,

				 struct buffer_head *di_bh,

				 struct buffer_head *dir_bh,

				 struct ocfs2_alloc_context *meta_ac,

				 struct ocfs2_alloc_context *data_ac)

{

	return 0;

}



#endif /* CONFIG_OCFS2_FS_POSIX_ACL*/



#endif /* OCFS2_ACL_H */

fs/ocfs2/cluster/heartbeat.c

+4 −2
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ static void o2hb_write_timeout(struct work_struct *work) 


static void o2hb_arm_write_timeout(struct o2hb_region *reg)

{

	mlog(0, "Queue write timeout for %u ms\n", O2HB_MAX_WRITE_TIMEOUT_MS);

	mlog(ML_HEARTBEAT, "Queue write timeout for %u ms\n",

	     O2HB_MAX_WRITE_TIMEOUT_MS);



	cancel_delayed_work(&reg->hr_write_timeout_work);

	reg->hr_last_timeout_start = jiffies;
@@ -874,7 +875,8 @@ static int o2hb_thread(void *data) 
		do_gettimeofday(&after_hb);

		elapsed_msec = o2hb_elapsed_msecs(&before_hb, &after_hb);



		mlog(0, "start = %lu.%lu, end = %lu.%lu, msec = %u\n",

		mlog(ML_HEARTBEAT,

		     "start = %lu.%lu, end = %lu.%lu, msec = %u\n",

		     before_hb.tv_sec, (unsigned long) before_hb.tv_usec,

		     after_hb.tv_sec, (unsigned long) after_hb.tv_usec,

		     elapsed_msec);

CRA Git | Maintained and supported by SUSTech CRA and CCSE