Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

Browse Source
This commit is contained in:
Linus Torvalds 2006-01-15 22:18:04 -08:00
commit 4a8e4a270b
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/xfs/linux-2.6/mutex.h
View File

@ -18,18 +18,8 @@
#ifndef __XFS_SUPPORT_MUTEX_H__
#define __XFS_SUPPORT_MUTEX_H__
#include <linux/spinlock.h>
#include <linux/mutex.h>
/*
* Map the mutex'es from IRIX to Linux semaphores.
*
* Destroy just simply initializes to -99 which should block all other
* callers.
*/
#define MUTEX_DEFAULT 0x0
typedef struct mutex mutex_t;
//#define mutex_destroy(lock) do{}while(0)
typedef struct mutex mutex_t;
#endif /* __XFS_SUPPORT_MUTEX_H__ */

16
fs/xfs/linux-2.6/xfs_iops.c
View File

@ -56,9 +56,6 @@
#include <linux/namei.h>
#include <linux/security.h>
#define IS_NOATIME(inode) ((inode->i_sb->s_flags & MS_NOATIME) || \
(S_ISDIR(inode->i_mode) && inode->i_sb->s_flags & MS_NODIRATIME))
/*
* Get a XFS inode from a given vnode.
*/
@ -474,11 +471,14 @@ linvfs_symlink(
error = 0;
VOP_SYMLINK(dvp, dentry, &va, (char *)symname, &cvp, NULL, error);
if (!error && cvp) {
ip = LINVFS_GET_IP(cvp);
d_instantiate(dentry, ip);
validate_fields(dir);
validate_fields(ip); /* size needs update */
if (likely(!error && cvp)) {
error = linvfs_init_security(cvp, dir);
if (likely(!error)) {
ip = LINVFS_GET_IP(cvp);
d_instantiate(dentry, ip);
validate_fields(dir);
validate_fields(ip);
}
}
return -error;
}

2
fs/xfs/quota/xfs_qm.c
View File

@ -167,7 +167,7 @@ xfs_Gqm_init(void)
xqm->qm_dqfree_ratio = XFS_QM_DQFREE_RATIO;
xqm->qm_nrefs = 0;
#ifdef DEBUG
xfs_mutex_init(&qcheck_lock, MUTEX_DEFAULT, "qchk");
mutex_init(&qcheck_lock);
#endif
return xqm;
}