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

Commit c5750ee6 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:
  [PATCH] fs/ocfs2/aops.c: Correct use of ! and &
  [2.6 patch] ocfs2: make dlm_do_assert_master() static
  [2.6 patch] make ocfs2_downconvert_thread() static
  [2.6 patch] fs/ocfs2/: possible cleanups
  [PATCH] ocfs2: le*_add_cpu conversion
  ocfs2: Fix writeout in ocfs2_data_convert_worker()
  ocfs2: Enable localalloc for local mounts
parents b1c3c3eb 86c838b0

fs/ocfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int ocfs2_readpage_inline(struct inode *inode, struct page *page) 
	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);



	BUG_ON(!PageLocked(page));

	BUG_ON(!OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL);

	BUG_ON(!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL));



	ret = ocfs2_read_block(osb, OCFS2_I(inode)->ip_blkno, &di_bh,

			       OCFS2_BH_CACHED, inode);

fs/ocfs2/dir.c

+2 −3
Original line number Diff line number Diff line
@@ -390,8 +390,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, 
				goto bail;

			}

			if (pde)

				pde->rec_len =

					cpu_to_le16(le16_to_cpu(pde->rec_len) +

				le16_add_cpu(&pde->rec_len,

						le16_to_cpu(de->rec_len));

			else

				de->inode = 0;

fs/ocfs2/dlm/dlmmaster.c

+3 −3
Original line number Diff line number Diff line
@@ -1695,7 +1695,7 @@ send_response: 
 * can periodically run all locks owned by this node

 * and re-assert across the cluster...

 */

int dlm_do_assert_master(struct dlm_ctxt *dlm,

static int dlm_do_assert_master(struct dlm_ctxt *dlm,

				struct dlm_lock_resource *res,

				void *nodemap, u32 flags)

{

fs/ocfs2/dlmglue.c

+4 −4
Original line number Diff line number Diff line
@@ -3042,7 +3042,7 @@ static int ocfs2_data_convert_worker(struct ocfs2_lock_res *lockres, 
       	inode = ocfs2_lock_res_inode(lockres);

	mapping = inode->i_mapping;



	if (S_ISREG(inode->i_mode))

	if (!S_ISREG(inode->i_mode))

		goto out;



	/*
@@ -3219,7 +3219,7 @@ static int ocfs2_dentry_convert_worker(struct ocfs2_lock_res *lockres, 
	return UNBLOCK_CONTINUE_POST;

}



void ocfs2_process_blocked_lock(struct ocfs2_super *osb,

static void ocfs2_process_blocked_lock(struct ocfs2_super *osb,

				       struct ocfs2_lock_res *lockres)

{

	int status;
@@ -3356,7 +3356,7 @@ static int ocfs2_downconvert_thread_should_wake(struct ocfs2_super *osb) 
	return should_wake;

}



int ocfs2_downconvert_thread(void *arg)

static int ocfs2_downconvert_thread(void *arg)

{

	int status = 0;

	struct ocfs2_super *osb = arg;

fs/ocfs2/dlmglue.h

+0 −2
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ void ocfs2_simple_drop_lockres(struct ocfs2_super *osb, 
			       struct ocfs2_lock_res *lockres);



/* for the downconvert thread */

void ocfs2_process_blocked_lock(struct ocfs2_super *osb,

				struct ocfs2_lock_res *lockres);

void ocfs2_wake_downconvert_thread(struct ocfs2_super *osb);



struct ocfs2_dlm_debug *ocfs2_new_dlm_debug(void);