From ba9aee3c37f56bea87f36f243d5fa3cd265537ef Mon Sep 17 00:00:00 2001 From: Dave Kleikamp Date: Wed, 1 May 2013 11:08:38 -0500 Subject: [PATCH] --- yaml --- r: 372156 b: refs/heads/master c: 73aaa22d5ffb2630456bac2f9a4ed9b81d0d7271 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jfs/inode.c | 2 +- trunk/fs/jfs/jfs_logmgr.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2b665cf9c24a..3d881711ce9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d48017bce890b19e3bba649850bdbc8a6f95903 +refs/heads/master: 73aaa22d5ffb2630456bac2f9a4ed9b81d0d7271 diff --git a/trunk/fs/jfs/inode.c b/trunk/fs/jfs/inode.c index b7dc47ba675e..77554b61d124 100644 --- a/trunk/fs/jfs/inode.c +++ b/trunk/fs/jfs/inode.c @@ -125,7 +125,7 @@ int jfs_write_inode(struct inode *inode, struct writeback_control *wbc) { int wait = wbc->sync_mode == WB_SYNC_ALL; - if (test_cflag(COMMIT_Nolink, inode)) + if (inode->i_nlink == 0) return 0; /* * If COMMIT_DIRTY is not set, the inode isn't really dirty. diff --git a/trunk/fs/jfs/jfs_logmgr.c b/trunk/fs/jfs/jfs_logmgr.c index 2eb952c41a69..cbe48ea9318e 100644 --- a/trunk/fs/jfs/jfs_logmgr.c +++ b/trunk/fs/jfs/jfs_logmgr.c @@ -1058,7 +1058,8 @@ static int lmLogSync(struct jfs_log * log, int hard_sync) */ void jfs_syncpt(struct jfs_log *log, int hard_sync) { LOG_LOCK(log); - lmLogSync(log, hard_sync); + if (!test_bit(log_QUIESCE, &log->flag)) + lmLogSync(log, hard_sync); LOG_UNLOCK(log); }