diff options
| author | Abhijith Das <adas@redhat.com> | 2009-06-01 12:30:03 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2009-06-02 08:01:12 +0100 |
| commit | a12af1ebe675e85831fde3c4d0908fc3b0908b7a (patch) | |
| tree | ae03ea46bfa57031ee561f21d6e387fcdd7c46c7 /fs | |
| parent | f6eb53498ee8f725832f3a0fffca90566bb118a6 (diff) | |
| download | op-kernel-dev-a12af1ebe675e85831fde3c4d0908fc3b0908b7a.zip op-kernel-dev-a12af1ebe675e85831fde3c4d0908fc3b0908b7a.tar.gz | |
GFS2: smbd proccess hangs with flock() call.
GFS2 currently does not support mandatory flocks. An flock() call with
LOCK_MAND triggers unexpected behavior because gfs2 is not checking for
this lock type. This patch corrects that.
Signed-off-by: Abhi Das <adas@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 73b6f55..841ddc9 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -698,8 +698,8 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl) if (!(fl->fl_flags & FL_FLOCK)) return -ENOLCK; - if (__mandatory_lock(&ip->i_inode)) - return -ENOLCK; + if (fl->fl_type & LOCK_MAND) + return -EOPNOTSUPP; if (fl->fl_type == F_UNLCK) { do_unflock(file, fl); |
