summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-07 12:56:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-07 12:56:27 -0700
commit45480aa75b03d6705ab5ceebda9d09be22f4e928 (patch)
treee8314360d01e4f2cea3a926f0f7f7d856d57c3cb /fs
parent1fc7995d19139d6f99203b43c161968f3f554a15 (diff)
parent581b7e9fc00789782cb3bdca58db49f6f0f66608 (diff)
downloadlinux-45480aa75b03d6705ab5ceebda9d09be22f4e928.tar.bz2
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: udf: super.c Fix warning: variable 'sbi' set but not used udf: remove duplicated #include
Diffstat (limited to 'fs')
-rw-r--r--fs/udf/file.c1
-rw-r--r--fs/udf/super.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c
index 94e06d6bddbd..6e450e01a1bb 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -36,7 +36,6 @@
#include <linux/pagemap.h>
#include <linux/buffer_head.h>
#include <linux/aio.h>
-#include <linux/smp_lock.h>
#include "udf_i.h"
#include "udf_sb.h"
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 612d1e2e285a..12bb651e5400 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1579,9 +1579,7 @@ static int udf_load_sequence(struct super_block *sb, struct buffer_head *bh,
{
struct anchorVolDescPtr *anchor;
long main_s, main_e, reserve_s, reserve_e;
- struct udf_sb_info *sbi;
- sbi = UDF_SB(sb);
anchor = (struct anchorVolDescPtr *)bh->b_data;
/* Locate the main sequence */