diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 20:36:17 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 20:36:17 -0500 |
| commit | daefd89efc279b142bbb054577c2d706da211723 (patch) | |
| tree | 2298056232548f6f22d7bbff2662a2bbf64520de /fs/logfs/dir.c | |
| parent | 6e33aceda2d82126e9d08a39e21a15be0dd00a6c (diff) | |
| parent | f86bcc302a8c570dd0f5a50097a6af96a0e717c2 (diff) | |
Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
Diffstat (limited to 'fs/logfs/dir.c')
| -rw-r--r-- | fs/logfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c index 501043e8966c..3de7a32cadbe 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, | |||
| 71 | 71 | ||
| 72 | static int write_inode(struct inode *inode) | 72 | static int write_inode(struct inode *inode) |
| 73 | { | 73 | { |
| 74 | return __logfs_write_inode(inode, WF_LOCK); | 74 | return __logfs_write_inode(inode, NULL, WF_LOCK); |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | static s64 dir_seek_data(struct inode *inode, s64 pos) | 77 | static s64 dir_seek_data(struct inode *inode, s64 pos) |