Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etercifs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
etercifs
Commits
a3252e01
Commit
a3252e01
authored
Mar 30, 2009
by
Konstantin Baev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
4.2.1-alt1.testing2
Updated sources 2.6.25 - 2.6.28 - Fixed F_GETLK problem with mount option forcemand - Some bugxixes near F_GETLK problem
parent
575cbfd2
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
137 additions
and
25 deletions
+137
-25
etercifs.spec
etercifs.spec
+5
-1
cifssmb.c
sources/2.6.25/cifssmb.c
+7
-4
file.c
sources/2.6.25/file.c
+26
-2
cifssmb.c
sources/2.6.26/cifssmb.c
+7
-4
file.c
sources/2.6.26/file.c
+26
-2
cifssmb.c
sources/2.6.27/cifssmb.c
+7
-4
file.c
sources/2.6.27/file.c
+26
-2
cifssmb.c
sources/2.6.28/cifssmb.c
+7
-4
file.c
sources/2.6.28/file.c
+26
-2
No files found.
etercifs.spec
View file @
a3252e01
...
...
@@ -23,7 +23,7 @@
Name: etercifs
Version: 4.2.1
Release: alt1.testing
1
Release: alt1.testing
2
Summary: Advanced Common Internet File System for Linux with Etersoft extension
...
...
@@ -118,6 +118,10 @@ cp %SOURCE28 %buildroot/%etercifs_src/%src_package_name-2.6.28-%src_2_6_28_versi
%doc README.ETER AUTHORS CHANGES README TODO
%changelog
* Mon Mar 30 2009 Konstantin Baev <kipruss@altlinux.org> 4.2.1-alt1.testing2
- Fixed F_GETLK problem with mount option forcemand
- Some bugxixes near F_GETLK problem
* Thu Mar 26 2009 Konstantin Baev <kipruss@altlinux.org> 4.2.1-alt1.testing1
- Fix bug Eter#3660 (F_GETLK problem connected with wrong returning file_lock structure)
- Refactoring code, which solved kmem_cache_destroy problem
...
...
sources/2.6.25/cifssmb.c
View file @
a3252e01
...
...
@@ -1862,16 +1862,19 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
}
parm_data
=
(
struct
cifs_posix_lock
*
)
((
char
*
)
&
pSMBr
->
hdr
.
Protocol
+
data_offset
);
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_UNLCK
))
if
(
parm_data
->
lock_type
==
__constant_
cpu_to_le16
(
CIFS_UNLCK
))
pLockData
->
fl_type
=
F_UNLCK
;
else
{
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_RDLCK
))
if
(
parm_data
->
lock_type
==
__constant_cpu_to_le16
(
CIFS_RDLCK
))
pLockData
->
fl_type
=
F_RDLCK
;
else
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_WRLCK
))
else
if
(
parm_data
->
lock_type
==
__constant_cpu_to_le16
(
CIFS_WRLCK
))
pLockData
->
fl_type
=
F_WRLCK
;
pLockData
->
fl_start
=
parm_data
->
start
;
pLockData
->
fl_end
=
parm_data
->
start
+
parm_data
->
length
-
1
;
pLockData
->
fl_end
=
parm_data
->
start
+
parm_data
->
length
-
1
;
pLockData
->
fl_pid
=
parm_data
->
pid
;
}
}
...
...
sources/2.6.25/file.c
View file @
a3252e01
...
...
@@ -748,8 +748,32 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
}
else
{
/* if rc == ERR_SHARING_VIOLATION ? */
rc
=
0
;
/* do not change lock type to unlock
since range in use */
rc
=
0
;
if
(
lockType
&
LOCKING_ANDX_SHARED_LOCK
)
{
pfLock
->
fl_type
=
F_WRLCK
;
}
else
{
rc
=
CIFSSMBLock
(
xid
,
pTcon
,
netfid
,
length
,
pfLock
->
fl_start
,
0
,
1
,
lockType
|
LOCKING_ANDX_SHARED_LOCK
,
0
/* wait flag */
);
if
(
rc
==
0
)
{
rc
=
CIFSSMBLock
(
xid
,
pTcon
,
netfid
,
length
,
pfLock
->
fl_start
,
1
,
0
,
lockType
|
LOCKING_ANDX_SHARED_LOCK
,
0
/* wait flag */
);
pfLock
->
fl_type
=
F_RDLCK
;
if
(
rc
!=
0
)
cERROR
(
1
,
(
"Error unlocking "
"previously locked range %d "
"during test of lock"
,
rc
));
rc
=
0
;
}
else
{
pfLock
->
fl_type
=
F_WRLCK
;
rc
=
0
;
}
}
}
FreeXid
(
xid
);
...
...
sources/2.6.26/cifssmb.c
View file @
a3252e01
...
...
@@ -1902,16 +1902,19 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
}
parm_data
=
(
struct
cifs_posix_lock
*
)
((
char
*
)
&
pSMBr
->
hdr
.
Protocol
+
data_offset
);
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_UNLCK
))
if
(
parm_data
->
lock_type
==
__constant_
cpu_to_le16
(
CIFS_UNLCK
))
pLockData
->
fl_type
=
F_UNLCK
;
else
{
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_RDLCK
))
if
(
parm_data
->
lock_type
==
__constant_cpu_to_le16
(
CIFS_RDLCK
))
pLockData
->
fl_type
=
F_RDLCK
;
else
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_WRLCK
))
else
if
(
parm_data
->
lock_type
==
__constant_cpu_to_le16
(
CIFS_WRLCK
))
pLockData
->
fl_type
=
F_WRLCK
;
pLockData
->
fl_start
=
parm_data
->
start
;
pLockData
->
fl_end
=
parm_data
->
start
+
parm_data
->
length
-
1
;
pLockData
->
fl_end
=
parm_data
->
start
+
parm_data
->
length
-
1
;
pLockData
->
fl_pid
=
parm_data
->
pid
;
}
}
...
...
sources/2.6.26/file.c
View file @
a3252e01
...
...
@@ -745,8 +745,32 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
}
else
{
/* if rc == ERR_SHARING_VIOLATION ? */
rc
=
0
;
/* do not change lock type to unlock
since range in use */
rc
=
0
;
if
(
lockType
&
LOCKING_ANDX_SHARED_LOCK
)
{
pfLock
->
fl_type
=
F_WRLCK
;
}
else
{
rc
=
CIFSSMBLock
(
xid
,
pTcon
,
netfid
,
length
,
pfLock
->
fl_start
,
0
,
1
,
lockType
|
LOCKING_ANDX_SHARED_LOCK
,
0
/* wait flag */
);
if
(
rc
==
0
)
{
rc
=
CIFSSMBLock
(
xid
,
pTcon
,
netfid
,
length
,
pfLock
->
fl_start
,
1
,
0
,
lockType
|
LOCKING_ANDX_SHARED_LOCK
,
0
/* wait flag */
);
pfLock
->
fl_type
=
F_RDLCK
;
if
(
rc
!=
0
)
cERROR
(
1
,
(
"Error unlocking "
"previously locked range %d "
"during test of lock"
,
rc
));
rc
=
0
;
}
else
{
pfLock
->
fl_type
=
F_WRLCK
;
rc
=
0
;
}
}
}
FreeXid
(
xid
);
...
...
sources/2.6.27/cifssmb.c
View file @
a3252e01
...
...
@@ -1877,16 +1877,19 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
}
parm_data
=
(
struct
cifs_posix_lock
*
)
((
char
*
)
&
pSMBr
->
hdr
.
Protocol
+
data_offset
);
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_UNLCK
))
if
(
parm_data
->
lock_type
==
__constant_
cpu_to_le16
(
CIFS_UNLCK
))
pLockData
->
fl_type
=
F_UNLCK
;
else
{
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_RDLCK
))
if
(
parm_data
->
lock_type
==
__constant_cpu_to_le16
(
CIFS_RDLCK
))
pLockData
->
fl_type
=
F_RDLCK
;
else
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_WRLCK
))
else
if
(
parm_data
->
lock_type
==
__constant_cpu_to_le16
(
CIFS_WRLCK
))
pLockData
->
fl_type
=
F_WRLCK
;
pLockData
->
fl_start
=
parm_data
->
start
;
pLockData
->
fl_end
=
parm_data
->
start
+
parm_data
->
length
-
1
;
pLockData
->
fl_end
=
parm_data
->
start
+
parm_data
->
length
-
1
;
pLockData
->
fl_pid
=
parm_data
->
pid
;
}
}
...
...
sources/2.6.27/file.c
View file @
a3252e01
...
...
@@ -746,8 +746,32 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
}
else
{
/* if rc == ERR_SHARING_VIOLATION ? */
rc
=
0
;
/* do not change lock type to unlock
since range in use */
rc
=
0
;
if
(
lockType
&
LOCKING_ANDX_SHARED_LOCK
)
{
pfLock
->
fl_type
=
F_WRLCK
;
}
else
{
rc
=
CIFSSMBLock
(
xid
,
pTcon
,
netfid
,
length
,
pfLock
->
fl_start
,
0
,
1
,
lockType
|
LOCKING_ANDX_SHARED_LOCK
,
0
/* wait flag */
);
if
(
rc
==
0
)
{
rc
=
CIFSSMBLock
(
xid
,
pTcon
,
netfid
,
length
,
pfLock
->
fl_start
,
1
,
0
,
lockType
|
LOCKING_ANDX_SHARED_LOCK
,
0
/* wait flag */
);
pfLock
->
fl_type
=
F_RDLCK
;
if
(
rc
!=
0
)
cERROR
(
1
,
(
"Error unlocking "
"previously locked range %d "
"during test of lock"
,
rc
));
rc
=
0
;
}
else
{
pfLock
->
fl_type
=
F_WRLCK
;
rc
=
0
;
}
}
}
FreeXid
(
xid
);
...
...
sources/2.6.28/cifssmb.c
View file @
a3252e01
...
...
@@ -1879,16 +1879,19 @@ CIFSSMBPosixLock(const int xid, struct cifsTconInfo *tcon,
}
parm_data
=
(
struct
cifs_posix_lock
*
)
((
char
*
)
&
pSMBr
->
hdr
.
Protocol
+
data_offset
);
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_UNLCK
))
if
(
parm_data
->
lock_type
==
__constant_
cpu_to_le16
(
CIFS_UNLCK
))
pLockData
->
fl_type
=
F_UNLCK
;
else
{
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_RDLCK
))
if
(
parm_data
->
lock_type
==
__constant_cpu_to_le16
(
CIFS_RDLCK
))
pLockData
->
fl_type
=
F_RDLCK
;
else
if
(
parm_data
->
lock_type
==
cpu_to_le16
(
CIFS_WRLCK
))
else
if
(
parm_data
->
lock_type
==
__constant_cpu_to_le16
(
CIFS_WRLCK
))
pLockData
->
fl_type
=
F_WRLCK
;
pLockData
->
fl_start
=
parm_data
->
start
;
pLockData
->
fl_end
=
parm_data
->
start
+
parm_data
->
length
-
1
;
pLockData
->
fl_end
=
parm_data
->
start
+
parm_data
->
length
-
1
;
pLockData
->
fl_pid
=
parm_data
->
pid
;
}
}
...
...
sources/2.6.28/file.c
View file @
a3252e01
...
...
@@ -753,8 +753,32 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
}
else
{
/* if rc == ERR_SHARING_VIOLATION ? */
rc
=
0
;
/* do not change lock type to unlock
since range in use */
rc
=
0
;
if
(
lockType
&
LOCKING_ANDX_SHARED_LOCK
)
{
pfLock
->
fl_type
=
F_WRLCK
;
}
else
{
rc
=
CIFSSMBLock
(
xid
,
pTcon
,
netfid
,
length
,
pfLock
->
fl_start
,
0
,
1
,
lockType
|
LOCKING_ANDX_SHARED_LOCK
,
0
/* wait flag */
);
if
(
rc
==
0
)
{
rc
=
CIFSSMBLock
(
xid
,
pTcon
,
netfid
,
length
,
pfLock
->
fl_start
,
1
,
0
,
lockType
|
LOCKING_ANDX_SHARED_LOCK
,
0
/* wait flag */
);
pfLock
->
fl_type
=
F_RDLCK
;
if
(
rc
!=
0
)
cERROR
(
1
,
(
"Error unlocking "
"previously locked range %d "
"during test of lock"
,
rc
));
rc
=
0
;
}
else
{
pfLock
->
fl_type
=
F_WRLCK
;
rc
=
0
;
}
}
}
FreeXid
(
xid
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment