diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-15 16:06:08 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-15 16:06:08 -0500 |
| commit | 0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41 (patch) | |
| tree | b80b1d344ec24cad28b057ef803cebac9434be01 /fs/xfs/xfs_attr.c | |
| parent | 70eff55d2d979cca700aa6906494f0c474f3f7ff (diff) | |
| parent | 101142c37be8e5af9b847860219217e6b958c739 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/xfs/xfs_attr.c')
| -rw-r--r-- | fs/xfs/xfs_attr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c index 93fa64dd1be6..e58f321fdae9 100644 --- a/fs/xfs/xfs_attr.c +++ b/fs/xfs/xfs_attr.c | |||
| @@ -929,7 +929,7 @@ xfs_attr_shortform_addname(xfs_da_args_t *args) | |||
| 929 | * This leaf block cannot have a "remote" value, we only call this routine | 929 | * This leaf block cannot have a "remote" value, we only call this routine |
| 930 | * if bmap_one_block() says there is only one block (ie: no remote blks). | 930 | * if bmap_one_block() says there is only one block (ie: no remote blks). |
| 931 | */ | 931 | */ |
| 932 | int | 932 | STATIC int |
| 933 | xfs_attr_leaf_addname(xfs_da_args_t *args) | 933 | xfs_attr_leaf_addname(xfs_da_args_t *args) |
| 934 | { | 934 | { |
| 935 | xfs_inode_t *dp; | 935 | xfs_inode_t *dp; |