From ac7508287b144460272778f669096c19eeef2e57 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 21 Sep 2009 17:01:06 -0700 Subject: [PATCH] --- yaml --- r: 164353 b: refs/heads/master c: 580be0837a7a59b207c3d5c661d044d8dd0a6a30 h: refs/heads/master i: 164351: 32bac53df4725141a25b68baa84a0682602b1624 v: v3 --- [refs] | 2 +- trunk/fs/inode.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fb505a0da16e..a106ae50a5c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5be461657be65460ad92be3527e3bb1dd11c49ea +refs/heads/master: 580be0837a7a59b207c3d5c661d044d8dd0a6a30 diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c index b2ba83d2c4e1..798052f87035 100644 --- a/trunk/fs/inode.c +++ b/trunk/fs/inode.c @@ -695,13 +695,15 @@ void unlock_new_inode(struct inode *inode) } #endif /* - * This is special! We do not need the spinlock - * when clearing I_LOCK, because we're guaranteed - * that nobody else tries to do anything about the - * state of the inode when it is locked, as we - * just created it (so there can be no old holders - * that haven't tested I_LOCK). + * This is special! We do not need the spinlock when clearing I_LOCK, + * because we're guaranteed that nobody else tries to do anything about + * the state of the inode when it is locked, as we just created it (so + * there can be no old holders that haven't tested I_LOCK). + * However we must emit the memory barrier so that other CPUs reliably + * see the clearing of I_LOCK after the other inode initialisation has + * completed. */ + smp_mb(); WARN_ON((inode->i_state & (I_LOCK|I_NEW)) != (I_LOCK|I_NEW)); inode->i_state &= ~(I_LOCK|I_NEW); wake_up_inode(inode);