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

Commit eda4b716 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: Fix system inodes cache overflow.
  ocfs2: Hold ip_lock when set/clear flags for indexed dir.
  ocfs2: Adjust masklog flag values
  Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem.
  ocfs2/dlm: Migrate lockres with no locks if it has a reference
parents 55fb78a3 7d8f9876

fs/ocfs2/aops.c

+5 −2
Original line number Diff line number Diff line
@@ -573,11 +573,14 @@ static void ocfs2_dio_end_io(struct kiocb *iocb, 
	/* this io's submitter should not have unlocked this before we could */

	BUG_ON(!ocfs2_iocb_is_rw_locked(iocb));



	if (ocfs2_iocb_is_sem_locked(iocb)) {

		up_read(&inode->i_alloc_sem);

		ocfs2_iocb_clear_sem_locked(iocb);

	}



	ocfs2_iocb_clear_rw_locked(iocb);



	level = ocfs2_iocb_rw_locked_level(iocb);

	if (!level)

		up_read(&inode->i_alloc_sem);

	ocfs2_rw_unlock(inode, level);



	if (is_async)

fs/ocfs2/aops.h

+21 −2
Original line number Diff line number Diff line
@@ -68,8 +68,27 @@ static inline void ocfs2_iocb_set_rw_locked(struct kiocb *iocb, int level) 
	else

		clear_bit(1, (unsigned long *)&iocb->private);

}



/*

 * Using a named enum representing lock types in terms of #N bit stored in

 * iocb->private, which is going to be used for communication bewteen

 * ocfs2_dio_end_io() and ocfs2_file_aio_write/read().

 */

enum ocfs2_iocb_lock_bits {

	OCFS2_IOCB_RW_LOCK = 0,

	OCFS2_IOCB_RW_LOCK_LEVEL,

	OCFS2_IOCB_SEM,

	OCFS2_IOCB_NUM_LOCKS

};



#define ocfs2_iocb_clear_rw_locked(iocb) \

	clear_bit(0, (unsigned long *)&iocb->private)

	clear_bit(OCFS2_IOCB_RW_LOCK, (unsigned long *)&iocb->private)

#define ocfs2_iocb_rw_locked_level(iocb) \

	test_bit(1, (unsigned long *)&iocb->private)

	test_bit(OCFS2_IOCB_RW_LOCK_LEVEL, (unsigned long *)&iocb->private)

#define ocfs2_iocb_set_sem_locked(iocb) \

	set_bit(OCFS2_IOCB_SEM, (unsigned long *)&iocb->private)

#define ocfs2_iocb_clear_sem_locked(iocb) \

	clear_bit(OCFS2_IOCB_SEM, (unsigned long *)&iocb->private)

#define ocfs2_iocb_is_sem_locked(iocb) \

	test_bit(OCFS2_IOCB_SEM, (unsigned long *)&iocb->private)

#endif /* OCFS2_FILE_H */

fs/ocfs2/cluster/masklog.c

+2 −1
Original line number Diff line number Diff line
@@ -113,10 +113,11 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = { 
	define_mask(QUOTA),

	define_mask(REFCOUNT),

	define_mask(BASTS),

	define_mask(RESERVATIONS),

	define_mask(CLUSTER),

	define_mask(ERROR),

	define_mask(NOTICE),

	define_mask(KTHREAD),

	define_mask(RESERVATIONS),

};



static struct attribute *mlog_attr_ptrs[MLOG_MAX_BITS] = {NULL, };

fs/ocfs2/cluster/masklog.h

+8 −7
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ 
#include <linux/sched.h>



/* bits that are frequently given and infrequently matched in the low word */

/* NOTE: If you add a flag, you need to also update mlog.c! */

/* NOTE: If you add a flag, you need to also update masklog.c! */

#define ML_ENTRY	0x0000000000000001ULL /* func call entry */

#define ML_EXIT		0x0000000000000002ULL /* func call exit */

#define ML_TCP		0x0000000000000004ULL /* net cluster/tcp.c */
@@ -114,13 +114,14 @@ 
#define ML_XATTR	0x0000000020000000ULL /* ocfs2 extended attributes */

#define ML_QUOTA	0x0000000040000000ULL /* ocfs2 quota operations */

#define ML_REFCOUNT	0x0000000080000000ULL /* refcount tree operations */

#define ML_BASTS	0x0000001000000000ULL /* dlmglue asts and basts */

#define ML_BASTS	0x0000000100000000ULL /* dlmglue asts and basts */

#define ML_RESERVATIONS	0x0000000200000000ULL /* ocfs2 alloc reservations */

#define ML_CLUSTER	0x0000000400000000ULL /* cluster stack */



/* bits that are infrequently given and frequently matched in the high word */

#define ML_ERROR	0x0000000100000000ULL /* sent to KERN_ERR */

#define ML_NOTICE	0x0000000200000000ULL /* setn to KERN_NOTICE */

#define ML_KTHREAD	0x0000000400000000ULL /* kernel thread activity */

#define ML_RESERVATIONS	0x0000000800000000ULL /* ocfs2 alloc reservations */

#define ML_CLUSTER	0x0000001000000000ULL /* cluster stack */

#define ML_ERROR	0x1000000000000000ULL /* sent to KERN_ERR */

#define ML_NOTICE	0x2000000000000000ULL /* setn to KERN_NOTICE */

#define ML_KTHREAD	0x4000000000000000ULL /* kernel thread activity */



#define MLOG_INITIAL_AND_MASK (ML_ERROR|ML_NOTICE)

#define MLOG_INITIAL_NOT_MASK (ML_ENTRY|ML_EXIT)

fs/ocfs2/dir.c

+4 −0
Original line number Diff line number Diff line
@@ -2461,8 +2461,10 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, 


	di->i_dx_root = cpu_to_le64(dr_blkno);



	spin_lock(&OCFS2_I(dir)->ip_lock);

	OCFS2_I(dir)->ip_dyn_features |= OCFS2_INDEXED_DIR_FL;

	di->i_dyn_features = cpu_to_le16(OCFS2_I(dir)->ip_dyn_features);

	spin_unlock(&OCFS2_I(dir)->ip_lock);



	ocfs2_journal_dirty(handle, di_bh);
@@ -4466,8 +4468,10 @@ static int ocfs2_dx_dir_remove_index(struct inode *dir, 
		goto out_commit;

	}



	spin_lock(&OCFS2_I(dir)->ip_lock);

	OCFS2_I(dir)->ip_dyn_features &= ~OCFS2_INDEXED_DIR_FL;

	di->i_dyn_features = cpu_to_le16(OCFS2_I(dir)->ip_dyn_features);

	spin_unlock(&OCFS2_I(dir)->ip_lock);

	di->i_dx_root = cpu_to_le64(0ULL);



	ocfs2_journal_dirty(handle, di_bh);