diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /fs/logfs/inode.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'fs/logfs/inode.c')
| -rw-r--r-- | fs/logfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c index 03b8c240aeda..edfea7a3a747 100644 --- a/fs/logfs/inode.c +++ b/fs/logfs/inode.c | |||
| @@ -293,7 +293,7 @@ static int logfs_write_inode(struct inode *inode, struct writeback_control *wbc) | |||
| 293 | return ret; | 293 | return ret; |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | /* called with inode_lock held */ | 296 | /* called with inode->i_lock held */ |
| 297 | static int logfs_drop_inode(struct inode *inode) | 297 | static int logfs_drop_inode(struct inode *inode) |
| 298 | { | 298 | { |
| 299 | struct logfs_super *super = logfs_super(inode->i_sb); | 299 | struct logfs_super *super = logfs_super(inode->i_sb); |