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

Commit fa24aa56 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: Force use of GFP_NOFS in ocfs2_write()
  ocfs2: fix sparse warnings in fs/ocfs2/cluster
  ocfs2: fix sparse warnings in fs/ocfs2/dlm
  ocfs2: fix sparse warnings in fs/ocfs2
  [PATCH] Copy i_flags to ocfs2 inode flags on write
  [PATCH] ocfs2: use __set_current_state()
  ocfs2: Wrap access of directory allocations with ip_alloc_sem.
  [PATCH] fs/ocfs2/: make 3 functions static
  ocfs2: Implement compat_ioctl()
parents 6cbf0c70 9315f130

fs/ocfs2/alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -2869,7 +2869,7 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb, 
	tl = &tl_copy->id2.i_dealloc;

	num_recs = le16_to_cpu(tl->tl_used);

	mlog(0, "cleanup %u records from %llu\n", num_recs,

	     (unsigned long long)tl_copy->i_blkno);

	     (unsigned long long)le64_to_cpu(tl_copy->i_blkno));



	mutex_lock(&tl_inode->i_mutex);

	for(i = 0; i < num_recs; i++) {
@@ -3801,8 +3801,8 @@ int ocfs2_prepare_truncate(struct ocfs2_super *osb, 
	fe = (struct ocfs2_dinode *) fe_bh->b_data;



	mlog(0, "fe->i_clusters = %u, new_i_clusters = %u, fe->i_size ="

	     "%llu\n", fe->i_clusters, new_i_clusters,

	     (unsigned long long)fe->i_size);

	     "%llu\n", le32_to_cpu(fe->i_clusters), new_i_clusters,

	     (unsigned long long)le64_to_cpu(fe->i_size));



	*tc = kzalloc(sizeof(struct ocfs2_truncate_context), GFP_KERNEL);

	if (!(*tc)) {

fs/ocfs2/aops.c

+6 −5
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, 


	if (!OCFS2_IS_VALID_DINODE(fe)) {

		mlog(ML_ERROR, "Invalid dinode #%llu: signature = %.*s\n",

		     (unsigned long long)fe->i_blkno, 7, fe->i_signature);

		     (unsigned long long)le64_to_cpu(fe->i_blkno), 7,

		     fe->i_signature);

		goto bail;

	}
@@ -939,7 +940,7 @@ out: 
 * Returns a negative error code or the number of bytes copied into

 * the page.

 */

int ocfs2_write_data_page(struct inode *inode, handle_t *handle,

static int ocfs2_write_data_page(struct inode *inode, handle_t *handle,

				 u64 *p_blkno, struct page *page,

				 struct ocfs2_write_ctxt *wc, int new)

{
@@ -1086,7 +1087,7 @@ static ssize_t ocfs2_write(struct file *file, u32 phys, handle_t *handle, 
	for(i = 0; i < numpages; i++) {

		index = start + i;



		cpages[i] = grab_cache_page(mapping, index);

		cpages[i] = find_or_create_page(mapping, index, GFP_NOFS);

		if (!cpages[i]) {

			ret = -ENOMEM;

			mlog_errno(ret);

fs/ocfs2/cluster/heartbeat.c

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static inline void o2hb_prepare_block(struct o2hb_region *reg, 
								   hb_block));



	mlog(ML_HB_BIO, "our node generation = 0x%llx, cksum = 0x%x\n",

	     (long long)cpu_to_le64(generation),

	     (long long)generation,

	     le32_to_cpu(hb_block->hb_cksum));

}

fs/ocfs2/cluster/tcp.c

+5 −5
Original line number Diff line number Diff line
@@ -1496,7 +1496,7 @@ static void o2net_start_connect(struct work_struct *work) 
	sock->sk->sk_allocation = GFP_ATOMIC;



	myaddr.sin_family = AF_INET;

	myaddr.sin_addr.s_addr = (__force u32)mynode->nd_ipv4_address;

	myaddr.sin_addr.s_addr = mynode->nd_ipv4_address;

	myaddr.sin_port = (__force u16)htons(0); /* any port */



	ret = sock->ops->bind(sock, (struct sockaddr *)&myaddr,
@@ -1521,8 +1521,8 @@ static void o2net_start_connect(struct work_struct *work) 
	spin_unlock(&nn->nn_lock);



	remoteaddr.sin_family = AF_INET;

	remoteaddr.sin_addr.s_addr = (__force u32)node->nd_ipv4_address;

	remoteaddr.sin_port = (__force u16)node->nd_ipv4_port;

	remoteaddr.sin_addr.s_addr = node->nd_ipv4_address;

	remoteaddr.sin_port = node->nd_ipv4_port;



	ret = sc->sc_sock->ops->connect(sc->sc_sock,

					(struct sockaddr *)&remoteaddr,
@@ -1810,8 +1810,8 @@ static int o2net_open_listening_sock(__be32 addr, __be16 port) 
	int ret;

	struct sockaddr_in sin = {

		.sin_family = PF_INET,

		.sin_addr = { .s_addr = (__force u32)addr },

		.sin_port = (__force u16)port,

		.sin_addr = { .s_addr = addr },

		.sin_port = port,

	};



	ret = sock_create(PF_INET, SOCK_STREAM, IPPROTO_TCP, &sock);

fs/ocfs2/dir.c

+6 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, 
			    struct buffer_head **new_de_bh)

{

	int status = 0;

	int credits, num_free_extents;

	int credits, num_free_extents, drop_alloc_sem = 0;

	loff_t dir_i_size;

	struct ocfs2_dinode *fe = (struct ocfs2_dinode *) parent_fe_bh->b_data;

	struct ocfs2_alloc_context *data_ac = NULL;
@@ -452,6 +452,9 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, 
		credits = OCFS2_SIMPLE_DIR_EXTEND_CREDITS;

	}



	down_write(&OCFS2_I(dir)->ip_alloc_sem);

	drop_alloc_sem = 1;



	handle = ocfs2_start_trans(osb, credits);

	if (IS_ERR(handle)) {

		status = PTR_ERR(handle);
@@ -497,6 +500,8 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb, 
	*new_de_bh = new_bh;

	get_bh(*new_de_bh);

bail:

	if (drop_alloc_sem)

		up_write(&OCFS2_I(dir)->ip_alloc_sem);

	if (handle)

		ocfs2_commit_trans(osb, handle);