Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38879
b: refs/heads/master
c: d00223f
h: refs/heads/master
i:
  38877: 88fb47a
  38875: eb15db2
  38871: afc84e6
  38863: 444e5c3
  38847: 96bcc28
v: v3
  • Loading branch information
Steven Whitehouse committed Oct 2, 2006
1 parent 6b8e9ae commit 8f62128
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 930cc237d67dc62464fe71529631d16f51d7aee3
refs/heads/master: d00223f1693173c7b51f867dd52049955a92d0ed
7 changes: 4 additions & 3 deletions trunk/fs/gfs2/ops_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -606,15 +606,16 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
if (fl->fl_type == F_UNLCK) {
do_unflock(file, fl);
return 0;
} else
} else {
return do_flock(file, cmd, fl);
}
}

const struct file_operations gfs2_file_fops = {
.llseek = gfs2_llseek,
.read = do_sync_read,
.read = do_sync_read,
.aio_read = generic_file_aio_read,
.write = do_sync_write,
.write = do_sync_write,
.aio_write = generic_file_aio_write,
.unlocked_ioctl = gfs2_ioctl,
.mmap = gfs2_mmap,
Expand Down

0 comments on commit 8f62128

Please sign in to comment.