summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-07-1718-111/+361
|\
| * [PATCH] ocfs2: fix oops in mmap_truncate testingColy Li2008-07-161-3/+10
| * configfs: call drop_link() to cleanup after create_link() failureLouis Rilling2008-07-141-1/+5
| * configfs: Allow ->make_item() and ->make_group() to return detailed errors.Joel Becker2008-07-144-48/+72
| * configfs: Fix failing mkdir() making racing rmdir() failLouis Rilling2008-07-142-10/+44
| * configfs: Fix deadlock with racing rmdir() and rename()Louis Rilling2008-07-141-20/+25
| * configfs: Make configfs_new_dirent() return error code instead of NULLLouis Rilling2008-07-141-4/+5
| * configfs: Protect configfs_dirent s_links list mutationsLouis Rilling2008-07-142-4/+9
| * configfs: Introduce configfs_dirent_lockLouis Rilling2008-07-144-1/+34
| * ocfs2: Don't snprintf() without a format.Joel Becker2008-07-141-1/+1
| * ocfs2: Fix CONFIG_OCFS2_DEBUG_FS #ifdefsJoel Becker2008-07-142-2/+2
| * ocfs2/net: Silence build warnings on sparc64Sunil Mushran2008-07-141-3/+5
| * ocfs2: Handle error during journal loadWengang Wang2008-07-141-1/+5
| * ocfs2: Silence an error message in ocfs2_file_aio_read()Sunil Mushran2008-07-141-1/+1
| * ocfs2: use simple_read_from_buffer()Akinobu Mita2008-07-141-14/+5
| * ocfs2: fix printk format warnings with OCFS2_FS_STATS=nRandy Dunlap2008-07-141-4/+4
| * [PATCH 2/2] ocfs2: Instrument fs cluster locksSunil Mushran2008-07-142-1/+133
| * [PATCH 1/2] ocfs2: Add CONFIG_OCFS2_FS_STATS config optionSunil Mushran2008-07-141-0/+8
* | Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6Linus Torvalds2008-07-1637-10/+32877
|\ \
| * | UBIFS: include to compilationArtem Bityutskiy2008-07-154-0/+85
| * | UBIFS: add new flash file systemArtem Bityutskiy2008-07-1532-0/+32780
| * | VFS: export sync_sb_inodesArtem Bityutskiy2008-07-141-2/+9
| * | VFS: move inode_lock into sync_sb_inodesHans Reiser2008-07-141-8/+3
| |/
* | Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2008-07-1622-1048/+1395
|\ \
| * \ Merge branch 'bkl-removal' into nextTrond Myklebust2008-07-1511-78/+99
| |\ \
| | * | NFSv4: Remove BKL from the nfsv4 state recoveryTrond Myklebust2008-07-151-2/+0
| | * | SUNRPC: Remove the BKL from the callback functionsTrond Myklebust2008-07-154-1/+16
| | * | NFS: Remove BKL from the readdir codeTrond Myklebust2008-07-151-3/+0
| | * | NFS: Remove BKL from the symlink codeTrond Myklebust2008-07-151-7/+1
| | * | NFS: Remove BKL from the sillydelete operationsTrond Myklebust2008-07-151-6/+0
| | * | NFS: Remove the BKL from the rename, rmdir and unlink operationsTrond Myklebust2008-07-151-6/+3
| | * | NFS: Remove BKL from NFS lookup codeTrond Myklebust2008-07-151-8/+1
| | * | NFS: Remove the BKL from nfs_link()Trond Myklebust2008-07-151-2/+0
| | * | NFS: Remove the BKL from the inode creation operationsTrond Myklebust2008-07-151-9/+0
| | * | NFS: Remove BKL usage from open()Trond Myklebust2008-07-153-10/+0
| | * | NFS: Remove BKL usage from the write pathTrond Myklebust2008-07-151-2/+0
| | * | NFS: Remove the BKL from the permission checking codeTrond Myklebust2008-07-151-4/+0
| | * | NFS: Remove attribute update related BKL referencesTrond Myklebust2008-07-152-8/+0
| | * | NFS: Remove BKL requirement from attribute updatesTrond Myklebust2008-07-152-11/+71
| | * | NFS: Protect inode->i_nlink updates using inode->i_lockTrond Myklebust2008-07-151-2/+10
| * | | Merge branch 'devel' into nextTrond Myklebust2008-07-1518-970/+1296
| |\ \ \ | | |/ /
| | * | nfs: set correct fl_len in nlmclnt_test()Felix Blyakher2008-07-151-1/+1
| | * | NFS: Allow either strict or sloppy mount option parsingChuck Lever2008-07-091-75/+128
| | * | NFS4: Set security flavor default for NFSv4 mounts like other defaultsChuck Lever2008-07-091-16/+6
| | * | NFS: Set security flavor default for NFSv2/3 mounts like other defaultsChuck Lever2008-07-091-17/+5
| | * | NFS: Refactor logic for parsing NFS security flavor mount optionsChuck Lever2008-07-091-65/+78
| | * | NFS: use documenting macro constants for initializing ac{reg, dir}{min, max}Chuck Lever2008-07-092-16/+16
| | * | NFS: Move the nfs_set_port() call out of nfs_parse_mount_options()Chuck Lever2008-07-091-3/+6
| | * | NFS: set transport defaults after mount option parsing is finishedTrond Myklebust2008-07-092-23/+50
| | * | SUNRPC: Use only rpcbind v2 for AF_INET requestsChuck Lever2008-07-091-21/+0
OpenPOWER on IntegriCloud