diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-12 01:01:34 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-12 01:01:34 +0200 |
commit | 886c81834884ed3df0d8cfc613d65441226786c8 (patch) | |
tree | d3f6358a94e99bdc8d29acffe461d2ad33812057 /fs/nfs/idmap.c | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
parent | ocfs2: set non-default s_time_gran during mount (diff) | |
download | linux-886c81834884ed3df0d8cfc613d65441226786c8.tar.xz linux-886c81834884ed3df0d8cfc613d65441226786c8.zip |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: set non-default s_time_gran during mount
ocfs2: Retry sendpage() if it returns EAGAIN
ocfs2: Fix rename/extend race
[2.6 patch] ocfs2_insert_extent(): remove dead code
ocfs2: Fix max offset calculations
ocfs2: check ia_size limits in setattr
ocfs2: Fix some casting errors related to file writes
ocfs2: use s_maxbytes directly in ocfs2_change_file_space()
ocfs2: Restrict inode changes in ocfs2_update_inode_atime()
Diffstat (limited to 'fs/nfs/idmap.c')
0 files changed, 0 insertions, 0 deletions