summaryrefslogtreecommitdiff
path: root/fs/logfs/dir.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-02-07 08:59:29 (GMT)
committerIngo Molnar <mingo@elte.hu>2012-02-07 08:59:29 (GMT)
commit290436c9c61ac983b1bd425da67242a4357c7701 (patch)
tree35e1f189b62eb50515600ad607d7fb57fc547870 /fs/logfs/dir.c
parent623ec991ce0e8cd5791bad656c162fa837635907 (diff)
parent62aa2b537c6f5957afd98e29f96897419ed5ebab (diff)
downloadlinux-fsl-qoriq-290436c9c61ac983b1bd425da67242a4357c7701.tar.xz
Merge tag 'v3.3-rc2' into perf/core
Linux 3.3-rc2 Pick up the latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/logfs/dir.c')
-rw-r--r--fs/logfs/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index 501043e..3de7a32 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -71,7 +71,7 @@ static int write_dir(struct inode *dir, struct logfs_disk_dentry *dd,
static int write_inode(struct inode *inode)
{
- return __logfs_write_inode(inode, WF_LOCK);
+ return __logfs_write_inode(inode, NULL, WF_LOCK);
}
static s64 dir_seek_data(struct inode *inode, s64 pos)