diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 15:23:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 15:23:24 -0700 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /fs/gfs2/super.c | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
| download | linux-08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6.tar.bz2 | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'fs/gfs2/super.c')
| -rw-r--r-- | fs/gfs2/super.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 141b781f2fcc..601913e0a482 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -15,7 +15,6 @@ #include <linux/crc32.h> #include <linux/gfs2_ondisk.h> #include <linux/bio.h> -#include <linux/lm_interface.h> #include "gfs2.h" #include "incore.h" @@ -339,7 +338,6 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp, struct gfs2_holder *t_gh) { struct gfs2_inode *ip; - struct gfs2_holder ji_gh; struct gfs2_jdesc *jd; struct lfcc *lfcc; LIST_HEAD(list); @@ -387,7 +385,6 @@ out: gfs2_glock_dq_uninit(&lfcc->gh); kfree(lfcc); } - gfs2_glock_dq_uninit(&ji_gh); return error; } |