git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
ocfs2
/
ioctl.c
diff --git
a/fs/ocfs2/ioctl.c
b/fs/ocfs2/ioctl.c
index
7b142f0
..
467b413
100644
(file)
--- a/
fs/ocfs2/ioctl.c
+++ b/
fs/ocfs2/ioctl.c
@@
-7,7
+7,6
@@
#include <linux/fs.h>
#include <linux/mount.h>
-#include <linux/smp_lock.h>
#define MLOG_MASK_PREFIX ML_INODE
#include <cluster/masklog.h>
@@
-102,8
+101,7
@@
bail_unlock:
bail:
mutex_unlock(&inode->i_mutex);
- if (bh)
- brelse(bh);
+ brelse(bh);
mlog_exit(status);
return status;