aboutsummaryrefslogtreecommitdiff
path: root/fs/udf
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-07-04 14:14:42 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-07-04 14:14:42 +0100
commit07929dcb963786512c760dd3ecd148d89295e7e5 (patch)
treef5db01392ebb968b4c8acb5a6b3b03a833bfcb02 /fs/udf
parentc2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff)
parent19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff)
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/udf')
-rw-r--r--fs/udf/namei.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index 4673157b262..ac191ed7df0 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -164,11 +164,7 @@ udf_find_entry(struct inode *dir, struct dentry *dentry,
uint32_t extoffset, elen, offset;
struct buffer_head *bh = NULL;
- if (!dir)
- return NULL;
-
size = (udf_ext0_offset(dir) + dir->i_size) >> 2;
-
f_pos = (udf_ext0_offset(dir) >> 2);
fibh->soffset = fibh->eoffset = (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2;